playwright 1.56.0-alpha-2025-09-23 → 1.56.0-alpha-2025-09-24

package/lib/agents/generateAgents.js

@@ -189,21 +189,35 @@ const vscodeToolMap = /* @__PURE__ */ new Map([
   ["edit", ["editFiles"]],
   ["write", ["createFile", "createDirectory"]]
 ]);
+const vscodeToolsOrder = ["createFile", "createDirectory", "editFiles", "fileSearch", "textSearch", "listDirectory", "readFile"];
+const vscodeToolPrefix = "test_";
 function saveAsVSCodeChatmode(agent) {
   function asVscodeTool(tool) {
     const [first, second] = tool.split("/");
     if (second)
-      return second;
+      return second.startsWith("browser_") ? vscodeToolPrefix + second : second;
     return vscodeToolMap.get(first) || first;
   }
-  const tools = agent.header.tools.map(asVscodeTool).flat().map((tool) => `'${tool}'`).join(", ");
+  const tools = agent.header.tools.map(asVscodeTool).flat().sort((a, b) => {
+    const indexA = vscodeToolsOrder.indexOf(a);
+    const indexB = vscodeToolsOrder.indexOf(b);
+    if (indexA === -1 && indexB === -1)
+      return a.localeCompare(b);
+    if (indexA === -1)
+      return 1;
+    if (indexB === -1)
+      return -1;
+    return indexA - indexB;
+  }).map((tool) => `'${tool}'`).join(", ");
   const lines = [];
   lines.push(`---`);
-  lines.push(`description: ${agent.header.description}. Examples: ${agent.examples.map((example) => `<example>${example}</example>`).join("")}`);
+  lines.push(`description: ${agent.header.description}.`);
   lines.push(`tools: [${tools}]`);
   lines.push(`---`);
   lines.push("");
   lines.push(agent.instructions);
+  for (const example of agent.examples)
+    lines.push(`<example>${example}</example>`);
   return lines.join("\n");
 }
 async function initVSCodeRepo() {
@@ -226,7 +240,8 @@ async function initVSCodeRepo() {
   mcpJson.servers["playwright-test"] = {
     type: "stdio",
     command: commonMcpServers.playwrightTest.command,
-    args: commonMcpServers.playwrightTest.args
+    args: commonMcpServers.playwrightTest.args,
+    env: { "PLAYWRIGHT_MCP_TOOL_PREFIX": vscodeToolPrefix }
   };
   await writeFile(mcpJsonPath, JSON.stringify(mcpJson, null, 2));
 }

package/lib/index.js

@@ -43,8 +43,6 @@ var import_utils = require("playwright-core/lib/utils");
 var import_globals = require("./common/globals");
 var import_testType = require("./common/testType");
 var import_browserBackend = require("./mcp/test/browserBackend");
-var import_babelBundle = require("./transform/babelBundle");
-var import_util = require("./util");
 var import_expect = require("./matchers/expect");
 var import_configLoader = require("./common/configLoader");
 var import_testType2 = require("./common/testType");
@@ -262,22 +260,6 @@ const playwrightFixtures = {
         if (data.apiName === "tracing.group")
           tracingGroupSteps.push(step);
       },
-      onApiCallRecovery: (data, error, channelOwner, recoveryHandlers) => {
-        const testInfo2 = (0, import_globals.currentTestInfo)();
-        if (!testInfo2 || !testInfo2._pauseOnError())
-          return;
-        const step = data.userData;
-        if (!step)
-          return;
-        const page = channelToPage(channelOwner);
-        if (!page)
-          return;
-        recoveryHandlers.push(async () => {
-          await (0, import_browserBackend.runBrowserBackendOnError)(page, () => {
-            return (0, import_util.stripAnsiEscapes)(createErrorCodeframe(error.message, step.location));
-          });
-        });
-      },
       onApiCallEnd: (data) => {
         if (data.apiName === "tracing.group")
           return;
@@ -398,12 +380,13 @@ const playwrightFixtures = {
     attachConnectedHeaderIfNeeded(testInfo, browserImpl);
     if (!_reuseContext) {
       const { context: context2, close } = await _contextFactory();
+      testInfo._onDidFinishTestFunctions.unshift(() => (0, import_browserBackend.runBrowserBackendAtEnd)(context2, testInfo.errors[0]?.message));
       await use(context2);
-      await (0, import_browserBackend.runBrowserBackendAtEnd)(context2);
       await close();
       return;
     }
     const context = await browserImpl._wrapApiCall(() => browserImpl._newContextForReuse(), { internal: true });
+    testInfo._onDidFinishTestFunctions.unshift(() => (0, import_browserBackend.runBrowserBackendAtEnd)(context, testInfo.errors[0]?.message));
     await use(context);
     const closeReason = testInfo.status === "timedOut" ? "Test timeout of " + testInfo.timeout + "ms exceeded." : "Test ended.";
     await browserImpl._wrapApiCall(() => browserImpl._disconnectFromReusedContext(closeReason), { internal: true });
@@ -577,7 +560,7 @@ class ArtifactsRecorder {
   }
   async willStartTest(testInfo) {
     this._testInfo = testInfo;
-    testInfo._onDidFinishTestFunction = () => this.didFinishTestFunction();
+    testInfo._onDidFinishTestFunctions.push(() => this.didFinishTestFunction());
     this._screenshotRecorder.fixOrdinal();
     await Promise.all(this._playwright._allContexts().map((context) => this.didCreateBrowserContext(context)));
     const existingApiRequests = Array.from(this._playwright.request._contexts);
@@ -688,36 +671,6 @@ function tracing() {
   return test.info()._tracing;
 }
 const test = _baseTest.extend(playwrightFixtures);
-function channelToPage(channelOwner) {
-  if (channelOwner._type === "Page")
-    return channelOwner;
-  if (channelOwner._type === "Frame")
-    return channelOwner.page();
-  return void 0;
-}
-function createErrorCodeframe(message, location) {
-  let source;
-  try {
-    source = import_fs.default.readFileSync(location.file, "utf-8") + "\n//";
-  } catch (e) {
-    return "";
-  }
-  return (0, import_babelBundle.codeFrameColumns)(
-    source,
-    {
-      start: {
-        line: location.line,
-        column: location.column
-      }
-    },
-    {
-      highlightCode: true,
-      linesAbove: 5,
-      linesBelow: 5,
-      message: message.split("\n")[0] || void 0
-    }
-  );
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   _baseTest,

package/lib/matchers/toBeTruthy.js

@@ -23,7 +23,6 @@ __export(toBeTruthy_exports, {
 module.exports = __toCommonJS(toBeTruthy_exports);
 var import_util = require("../util");
 var import_matcherHint = require("./matcherHint");
-var import_browserBackend = require("../mcp/test/browserBackend");
 async function toBeTruthy(matcherName, locator, receiverType, expected, arg, query, options = {}) {
   (0, import_util.expectTypes)(locator, [receiverType], matcherName);
   const timeout = options.timeout ?? this.timeout;
@@ -58,7 +57,6 @@ async function toBeTruthy(matcherName, locator, receiverType, expected, arg, que
       log
     });
   };
-  await (0, import_browserBackend.runBrowserBackendOnError)(locator.page(), message);
   return {
     message,
     pass,

package/lib/matchers/toEqual.js

@@ -24,7 +24,6 @@ module.exports = __toCommonJS(toEqual_exports);
 var import_utils = require("playwright-core/lib/utils");
 var import_util = require("../util");
 var import_matcherHint = require("./matcherHint");
-var import_browserBackend = require("../mcp/test/browserBackend");
 const EXPECTED_LABEL = "Expected";
 const RECEIVED_LABEL = "Received";
 async function toEqual(matcherName, locator, receiverType, query, expected, options = {}) {
@@ -84,7 +83,6 @@ async function toEqual(matcherName, locator, receiverType, query, expected, opti
       log
     });
   };
-  await (0, import_browserBackend.runBrowserBackendOnError)(locator.page(), message);
   return {
     actual: received,
     expected,

package/lib/matchers/toMatchText.js

@@ -25,7 +25,6 @@ var import_util = require("../util");
 var import_expect = require("./expect");
 var import_matcherHint = require("./matcherHint");
 var import_expectBundle = require("../common/expectBundle");
-var import_browserBackend = require("../mcp/test/browserBackend");
 async function toMatchText(matcherName, receiver, receiverType, query, expected, options = {}) {
   (0, import_util.expectTypes)(receiver, [receiverType], matcherName);
   const locator = receiverType === "Locator" ? receiver : void 0;
@@ -84,8 +83,6 @@ ${this.utils.printWithType("Expected", expected, this.utils.printExpected)}`;
       errorMessage
     });
   };
-  if (locator)
-    await (0, import_browserBackend.runBrowserBackendOnError)(locator.page(), message);
   return {
     name: matcherName,
     expected,

package/lib/mcp/browser/browserContextFactory.js

@@ -80,16 +80,20 @@ class BaseContextFactory {
     const browser = await this._obtainBrowser(clientInfo);
     const browserContext = await this._doCreateContext(browser);
     await addInitScript(browserContext, this.config.browser.initScript);
-    return { browserContext, close: () => this._closeBrowserContext(browserContext, browser) };
+    return {
+      browserContext,
+      close: (afterClose) => this._closeBrowserContext(browserContext, browser, afterClose)
+    };
   }
   async _doCreateContext(browser) {
     throw new Error("Not implemented");
   }
-  async _closeBrowserContext(browserContext, browser) {
+  async _closeBrowserContext(browserContext, browser, afterClose) {
     (0, import_log.testDebug)(`close browser context (${this._logName})`);
     if (browser.contexts().length === 1)
       this._browserPromise = void 0;
     await browserContext.close().catch(import_log.logUnhandledError);
+    await afterClose();
     if (browser.contexts().length === 0) {
       (0, import_log.testDebug)(`close browser (${this._logName})`);
       await browser.close().catch(import_log.logUnhandledError);
@@ -103,8 +107,8 @@ class IsolatedContextFactory extends BaseContextFactory {
   async _doObtainBrowser(clientInfo) {
     await injectCdpPort(this.config.browser);
     const browserType = playwright[this.config.browser.browserName];
-    const tracesDir = await (0, import_config.outputFile)(this.config, clientInfo, `traces`, { origin: "code" });
-    if (this.config.saveTrace)
+    const tracesDir = await computeTracesDir(this.config, clientInfo);
+    if (tracesDir && this.config.saveTrace)
       await startTraceServer(this.config, tracesDir);
     return browserType.launch({
       tracesDir,
@@ -158,8 +162,8 @@ class PersistentContextFactory {
     await injectCdpPort(this.config.browser);
     (0, import_log.testDebug)("create browser context (persistent)");
     const userDataDir = this.config.browser.userDataDir ?? await this._createUserDataDir(clientInfo);
-    const tracesDir = await (0, import_config.outputFile)(this.config, clientInfo, `traces`, { origin: "code" });
-    if (this.config.saveTrace)
+    const tracesDir = await computeTracesDir(this.config, clientInfo);
+    if (tracesDir && this.config.saveTrace)
       await startTraceServer(this.config, tracesDir);
     this._userDataDirs.add(userDataDir);
     (0, import_log.testDebug)("lock user data dir", userDataDir);
@@ -179,7 +183,7 @@ class PersistentContextFactory {
       try {
         const browserContext = await browserType.launchPersistentContext(userDataDir, launchOptions);
         await addInitScript(browserContext, this.config.browser.initScript);
-        const close = () => this._closeBrowserContext(browserContext, userDataDir);
+        const close = (afterClose) => this._closeBrowserContext(browserContext, userDataDir, afterClose);
         return { browserContext, close };
       } catch (error) {
         if (error.message.includes("Executable doesn't exist"))
@@ -193,11 +197,12 @@ class PersistentContextFactory {
     }
     throw new Error(`Browser is already in use for ${userDataDir}, use --isolated to run multiple instances of the same browser`);
   }
-  async _closeBrowserContext(browserContext, userDataDir) {
+  async _closeBrowserContext(browserContext, userDataDir, afterClose) {
     (0, import_log.testDebug)("close browser context (persistent)");
     (0, import_log.testDebug)("release user data dir", userDataDir);
     await browserContext.close().catch(() => {
     });
+    await afterClose();
     this._userDataDirs.delete(userDataDir);
     (0, import_log.testDebug)("close browser context complete (persistent)");
   }
@@ -275,9 +280,15 @@ class SharedContextFactory {
     if (!contextPromise)
       return;
     const { close } = await contextPromise;
-    await close();
+    await close(async () => {
+    });
   }
 }
+async function computeTracesDir(config, clientInfo) {
+  if (!config.saveTrace && !config.capabilities?.includes("tracing"))
+    return;
+  return await (0, import_config.outputFile)(config, clientInfo, `traces`, { origin: "code", reason: "Collecting trace" });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SharedContextFactory,

package/lib/mcp/browser/browserServerBackend.js

@@ -52,6 +52,7 @@ class BrowserServerBackend {
     const parsedArguments = tool.schema.inputSchema.parse(rawArguments || {});
     const context = this._context;
     const response = new import_response.Response(context, name, parsedArguments);
+    response.logBegin();
     context.setRunningTool(name);
     try {
       await tool.handle(context, parsedArguments, response);
@@ -62,6 +63,7 @@ class BrowserServerBackend {
     } finally {
       context.setRunningTool(void 0);
     }
+    response.logEnd();
     return response.serialize();
   }
   serverClosed() {

package/lib/mcp/browser/config.js

@@ -34,7 +34,9 @@ __export(config_exports, {
   dotenvFileLoader: () => dotenvFileLoader,
   headerParser: () => headerParser,
   numberParser: () => numberParser,
+  outputDir: () => outputDir,
   outputFile: () => outputFile,
+  resolutionParser: () => resolutionParser,
   resolveCLIConfig: () => resolveCLIConfig,
   resolveConfig: () => resolveConfig,
   semicolonSeparatedList: () => semicolonSeparatedList
@@ -91,6 +93,8 @@ async function validateConfig(config) {
         throw new Error(`Init script file does not exist: ${script}`);
     }
   }
+  if (config.sharedBrowserContext && config.saveVideo)
+    throw new Error("saveVideo is not supported when sharedBrowserContext is true");
 }
 function configFromCLIOptions(cliOptions) {
   let browserName;
@@ -136,22 +140,21 @@ function configFromCLIOptions(cliOptions) {
     contextOptions.storageState = cliOptions.storageState;
   if (cliOptions.userAgent)
     contextOptions.userAgent = cliOptions.userAgent;
-  if (cliOptions.viewportSize) {
-    try {
-      const [width, height] = cliOptions.viewportSize.split(",").map((n) => +n);
-      if (isNaN(width) || isNaN(height))
-        throw new Error("bad values");
-      contextOptions.viewport = { width, height };
-    } catch (e) {
-      throw new Error('Invalid viewport size format: use "width,height", for example --viewport-size="800,600"');
-    }
-  }
+  if (cliOptions.viewportSize)
+    contextOptions.viewport = cliOptions.viewportSize;
   if (cliOptions.ignoreHttpsErrors)
     contextOptions.ignoreHTTPSErrors = true;
   if (cliOptions.blockServiceWorkers)
     contextOptions.serviceWorkers = "block";
   if (cliOptions.grantPermissions)
     contextOptions.permissions = cliOptions.grantPermissions;
+  if (cliOptions.saveVideo) {
+    contextOptions.recordVideo = {
+      // Videos are moved to output directory on saveAs.
+      dir: tmpDir(),
+      size: cliOptions.saveVideo
+    };
+  }
   const result = {
     browser: {
       browserName,
@@ -165,7 +168,8 @@ function configFromCLIOptions(cliOptions) {
     },
     server: {
       port: cliOptions.port,
-      host: cliOptions.host
+      host: cliOptions.host,
+      allowedHosts: cliOptions.allowedHosts
     },
     capabilities: cliOptions.caps,
     network: {
@@ -174,6 +178,7 @@ function configFromCLIOptions(cliOptions) {
     },
     saveSession: cliOptions.saveSession,
     saveTrace: cliOptions.saveTrace,
+    saveVideo: cliOptions.saveVideo,
     secrets: cliOptions.secrets,
     sharedBrowserContext: cliOptions.sharedBrowserContext,
     outputDir: cliOptions.outputDir,
@@ -187,6 +192,7 @@ function configFromCLIOptions(cliOptions) {
 }
 function configFromEnv() {
   const options = {};
+  options.allowedHosts = commaSeparatedList(process.env.PLAYWRIGHT_MCP_ALLOWED_HOSTNAMES);
   options.allowedOrigins = semicolonSeparatedList(process.env.PLAYWRIGHT_MCP_ALLOWED_ORIGINS);
   options.blockedOrigins = semicolonSeparatedList(process.env.PLAYWRIGHT_MCP_BLOCKED_ORIGINS);
   options.blockServiceWorkers = envToBoolean(process.env.PLAYWRIGHT_MCP_BLOCK_SERVICE_WORKERS);
@@ -213,13 +219,14 @@ function configFromEnv() {
   options.proxyBypass = envToString(process.env.PLAYWRIGHT_MCP_PROXY_BYPASS);
   options.proxyServer = envToString(process.env.PLAYWRIGHT_MCP_PROXY_SERVER);
   options.saveTrace = envToBoolean(process.env.PLAYWRIGHT_MCP_SAVE_TRACE);
+  options.saveVideo = resolutionParser("--save-video", process.env.PLAYWRIGHT_MCP_SAVE_VIDEO);
   options.secrets = dotenvFileLoader(process.env.PLAYWRIGHT_MCP_SECRETS_FILE);
   options.storageState = envToString(process.env.PLAYWRIGHT_MCP_STORAGE_STATE);
   options.timeoutAction = numberParser(process.env.PLAYWRIGHT_MCP_TIMEOUT_ACTION);
   options.timeoutNavigation = numberParser(process.env.PLAYWRIGHT_MCP_TIMEOUT_NAVIGATION);
   options.userAgent = envToString(process.env.PLAYWRIGHT_MCP_USER_AGENT);
   options.userDataDir = envToString(process.env.PLAYWRIGHT_MCP_USER_DATA_DIR);
-  options.viewportSize = envToString(process.env.PLAYWRIGHT_MCP_VIEWPORT_SIZE);
+  options.viewportSize = resolutionParser("--viewport-size", process.env.PLAYWRIGHT_MCP_VIEWPORT_SIZE);
   return configFromCLIOptions(options);
 }
 async function loadConfig(configFile) {
@@ -231,19 +238,30 @@ async function loadConfig(configFile) {
     throw new Error(`Failed to load config file: ${configFile}, ${error}`);
   }
 }
-async function outputFile(config, clientInfo, fileName, options) {
+function tmpDir() {
+  return import_path.default.join(process.env.PW_TMPDIR_FOR_TEST ?? import_os.default.tmpdir(), "playwright-mcp-output");
+}
+function outputDir(config, clientInfo) {
   const rootPath = (0, import_server.firstRootPath)(clientInfo);
-  const outputDir = config.outputDir ?? (rootPath ? import_path.default.join(rootPath, ".playwright-mcp") : void 0) ?? import_path.default.join(process.env.PW_TMPDIR_FOR_TEST ?? import_os.default.tmpdir(), "playwright-mcp-output", String(clientInfo.timestamp));
+  return config.outputDir ?? (rootPath ? import_path.default.join(rootPath, ".playwright-mcp") : void 0) ?? import_path.default.join(tmpDir(), String(clientInfo.timestamp));
+}
+async function outputFile(config, clientInfo, fileName, options) {
+  const file = await resolveFile(config, clientInfo, fileName, options);
+  (0, import_utilsBundle.debug)("pw:mcp:file")(options.reason, file);
+  return file;
+}
+async function resolveFile(config, clientInfo, fileName, options) {
+  const dir = outputDir(config, clientInfo);
   if (options.origin === "code")
-    return import_path.default.resolve(outputDir, fileName);
+    return import_path.default.resolve(dir, fileName);
   if (options.origin === "llm") {
     fileName = fileName.split("\\").join("/");
-    const resolvedFile = import_path.default.resolve(outputDir, fileName);
-    if (!resolvedFile.startsWith(import_path.default.resolve(outputDir) + import_path.default.sep))
+    const resolvedFile = import_path.default.resolve(dir, fileName);
+    if (!resolvedFile.startsWith(import_path.default.resolve(dir) + import_path.default.sep))
       throw new Error(`Resolved file path for ${fileName} is outside of the output directory`);
     return resolvedFile;
   }
-  return import_path.default.join(outputDir, sanitizeForFilePath(fileName));
+  return import_path.default.join(dir, sanitizeForFilePath(fileName));
 }
 function pickDefined(obj) {
   return Object.fromEntries(
@@ -306,6 +324,23 @@ function numberParser(value) {
     return void 0;
   return +value;
 }
+function resolutionParser(name, value) {
+  if (!value)
+    return void 0;
+  if (value.includes("x")) {
+    const [width, height] = value.split("x").map((v) => +v);
+    if (isNaN(width) || isNaN(height) || width <= 0 || height <= 0)
+      throw new Error(`Invalid resolution format: use ${name}="800x600"`);
+    return { width, height };
+  }
+  if (value.includes(",")) {
+    const [width, height] = value.split(",").map((v) => +v);
+    if (isNaN(width) || isNaN(height) || width <= 0 || height <= 0)
+      throw new Error(`Invalid resolution format: use ${name}="800x600"`);
+    return { width, height };
+  }
+  throw new Error(`Invalid resolution format: use ${name}="800x600"`);
+}
 function headerParser(arg, previous) {
   if (!arg)
     return previous || {};
@@ -339,7 +374,9 @@ function sanitizeForFilePath(s) {
   dotenvFileLoader,
   headerParser,
   numberParser,
+  outputDir,
   outputFile,
+  resolutionParser,
   resolveCLIConfig,
   resolveConfig,
   semicolonSeparatedList

package/lib/mcp/browser/context.js

@@ -32,11 +32,14 @@ __export(context_exports, {
   InputRecorder: () => InputRecorder
 });
 module.exports = __toCommonJS(context_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
 var import_utilsBundle = require("playwright-core/lib/utilsBundle");
 var import_log = require("../log");
 var import_tab = require("./tab");
 var import_config = require("./config");
 var codegen = __toESM(require("./codegen"));
+var import_utils = require("./tools/utils");
 const testDebug = (0, import_utilsBundle.debug)("pw:mcp:test");
 class Context {
   constructor(options) {
@@ -135,7 +138,20 @@ class Context {
     await promise.then(async ({ browserContext, close }) => {
       if (this.config.saveTrace)
         await browserContext.tracing.stop();
-      await close();
+      const videos = browserContext.pages().map((page) => page.video()).filter((video) => !!video);
+      await close(async () => {
+        for (const video of videos) {
+          const name = await this.outputFile((0, import_utils.dateAsFileName)("webm"), { origin: "code", reason: "Saving video" });
+          await import_fs.default.promises.mkdir(import_path.default.dirname(name), { recursive: true });
+          const p = await video.path();
+          try {
+            if (import_fs.default.existsSync(p))
+              await import_fs.default.promises.rename(p, name);
+          } catch (e) {
+            (0, import_log.logUnhandledError)(e);
+          }
+        }
+      });
     });
   }
   async dispose() {

package/lib/mcp/browser/response.js

@@ -18,16 +18,19 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var response_exports = {};
 __export(response_exports, {
-  Response: () => Response
+  Response: () => Response,
+  requestDebug: () => requestDebug
 });
 module.exports = __toCommonJS(response_exports);
+var import_utilsBundle = require("playwright-core/lib/utilsBundle");
 var import_tab = require("./tab");
+const requestDebug = (0, import_utilsBundle.debug)("pw:mcp:request");
 class Response {
   constructor(context, toolName, toolArgs) {
     this._result = [];
     this._code = [];
     this._images = [];
-    this._includeSnapshot = "none";
+    this._includeSnapshot = false;
     this._includeTabs = false;
     this._context = context;
     this.toolName = toolName;
@@ -58,14 +61,14 @@ class Response {
   images() {
     return this._images;
   }
-  setIncludeSnapshot(full) {
-    this._includeSnapshot = full ?? "partial";
+  setIncludeSnapshot() {
+    this._includeSnapshot = true;
   }
   setIncludeTabs() {
     this._includeTabs = true;
   }
   async finish() {
-    if (this._includeSnapshot !== "none" && this._context.currentTab())
+    if (this._includeSnapshot && this._context.currentTab())
       this._tabSnapshot = await this._context.currentTabOrDie().captureSnapshot();
     for (const tab of this._context.tabs())
       await tab.updateTitle();
@@ -73,7 +76,15 @@ class Response {
   tabSnapshot() {
     return this._tabSnapshot;
   }
-  serialize() {
+  logBegin() {
+    if (requestDebug.enabled)
+      requestDebug(this.toolName, this.toolArgs);
+  }
+  logEnd() {
+    if (requestDebug.enabled)
+      requestDebug(this.serialize({ omitSnapshot: true, omitBlobs: true }));
+  }
+  serialize(options = {}) {
     const response = [];
     if (this._result.length) {
       response.push("### Result");
@@ -87,13 +98,13 @@ ${this._code.join("\n")}
 \`\`\``);
       response.push("");
     }
-    if (this._includeSnapshot !== "none" || this._includeTabs)
+    if (this._includeSnapshot || this._includeTabs)
       response.push(...renderTabsMarkdown(this._context.tabs(), this._includeTabs));
     if (this._tabSnapshot?.modalStates.length) {
       response.push(...(0, import_tab.renderModalStates)(this._context, this._tabSnapshot.modalStates));
       response.push("");
     } else if (this._tabSnapshot) {
-      response.push(renderTabSnapshot(this._tabSnapshot, this._includeSnapshot === "full"));
+      response.push(renderTabSnapshot(this._tabSnapshot, options));
       response.push("");
     }
     const content = [
@@ -101,7 +112,7 @@ ${this._code.join("\n")}
     ];
     if (this._context.config.imageResponses !== "omit") {
       for (const image of this._images)
-        content.push({ type: "image", data: image.data.toString("base64"), mimeType: image.contentType });
+        content.push({ type: "image", data: options.omitBlobs ? "<blob>" : image.data.toString("base64"), mimeType: image.contentType });
     }
     this._redactSecrets(content);
     return { content, isError: this._isError };
@@ -117,7 +128,7 @@ ${this._code.join("\n")}
     }
   }
 }
-function renderTabSnapshot(tabSnapshot, fullSnapshot) {
+function renderTabSnapshot(tabSnapshot, options = {}) {
   const lines = [];
   if (tabSnapshot.consoleMessages.length) {
     lines.push(`### New console messages`);
@@ -138,15 +149,10 @@ function renderTabSnapshot(tabSnapshot, fullSnapshot) {
   lines.push(`### Page state`);
   lines.push(`- Page URL: ${tabSnapshot.url}`);
   lines.push(`- Page Title: ${tabSnapshot.title}`);
-  if (!fullSnapshot && tabSnapshot.formattedAriaSnapshotDiff) {
-    lines.push(`- Page Snapshot Diff:`);
-    lines.push(tabSnapshot.formattedAriaSnapshotDiff);
-  } else {
-    lines.push(`- Page Snapshot:`);
-    lines.push("```yaml");
-    lines.push(tabSnapshot.ariaSnapshot);
-    lines.push("```");
-  }
+  lines.push(`- Page Snapshot:`);
+  lines.push("```yaml");
+  lines.push(options.omitSnapshot ? "<snapshot>" : tabSnapshot.ariaSnapshot);
+  lines.push("```");
   return lines.join("\n");
 }
 function renderTabsMarkdown(tabs, force = false) {
@@ -175,5 +181,6 @@ function trim(text, maxLength) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Response
+  Response,
+  requestDebug
 });

package/lib/mcp/browser/sessionLog.js

@@ -44,7 +44,7 @@ class SessionLog {
     this._file = import_path.default.join(this._folder, "session.md");
   }
   static async create(config, clientInfo) {
-    const sessionFolder = await (0, import_config.outputFile)(config, clientInfo, `session-${Date.now()}`, { origin: "code" });
+    const sessionFolder = await (0, import_config.outputFile)(config, clientInfo, `session-${Date.now()}`, { origin: "code", reason: "Saving session" });
     await import_fs.default.promises.mkdir(sessionFolder, { recursive: true });
     console.error(`Session: ${sessionFolder}`);
     return new SessionLog(sessionFolder);

package/lib/mcp/browser/tab.js

@@ -25,9 +25,10 @@ __export(tab_exports, {
 module.exports = __toCommonJS(tab_exports);
 var import_events = require("events");
 var import_utils = require("playwright-core/lib/utils");
-var import_utilsBundle = require("playwright-core/lib/utilsBundle");
 var import_utils2 = require("./tools/utils");
 var import_log = require("../log");
+var import_dialogs = require("./tools/dialogs");
+var import_files = require("./tools/files");
 const TabEvents = {
   modalState: "modalState"
 };
@@ -45,11 +46,7 @@ class Tab extends import_events.EventEmitter {
     this._onPageClose = onPageClose;
     page.on("console", (event) => this._handleConsoleMessage(messageToConsoleMessage(event)));
     page.on("pageerror", (error) => this._handleConsoleMessage(pageErrorToConsoleMessage(error)));
-    page.on("request", (request) => {
-      this._requests.set(request, null);
-      if (request.frame() === page.mainFrame() && request.isNavigationRequest())
-        this._willNavigateMainFrameToNewDocument();
-    });
+    page.on("request", (request) => this._requests.set(request, null));
     page.on("response", (response) => this._requests.set(response.request(), response));
     page.on("close", () => this._onClose());
     page.on("filechooser", (chooser) => {
@@ -57,7 +54,7 @@ class Tab extends import_events.EventEmitter {
         type: "fileChooser",
         description: "File chooser",
         fileChooser: chooser,
-        clearedBy: "browser_file_upload"
+        clearedBy: import_files.uploadFile.schema.name
       });
     });
     page.on("dialog", (dialog) => this._dialogShown(dialog));
@@ -106,14 +103,14 @@ class Tab extends import_events.EventEmitter {
       type: "dialog",
       description: `"${dialog.type()}" dialog with message "${dialog.message()}"`,
       dialog,
-      clearedBy: "browser_handle_dialog"
+      clearedBy: import_dialogs.handleDialog.schema.name
     });
   }
   async _downloadStarted(download) {
     const entry = {
       download,
       finished: false,
-      outputFile: await this.context.outputFile(download.suggestedFilename(), { origin: "web" })
+      outputFile: await this.context.outputFile(download.suggestedFilename(), { origin: "web", reason: "Saving download" })
     };
     this._downloads.push(entry);
     await download.saveAs(entry.outputFile);
@@ -132,9 +129,6 @@ class Tab extends import_events.EventEmitter {
     this._clearCollectedArtifacts();
     this._onPageClose(this);
   }
-  _willNavigateMainFrameToNewDocument() {
-    this._lastAriaSnapshot = void 0;
-  }
   async updateTitle() {
     await this._raceAgainstModalStates(async () => {
       this._lastTitle = await (0, import_utils2.callOnPageNoTrace)(this.page, (page) => page.title());
@@ -151,7 +145,6 @@ class Tab extends import_events.EventEmitter {
   }
   async navigate(url) {
     this._clearCollectedArtifacts();
-    this._willNavigateMainFrameToNewDocument();
     const downloadEvent = (0, import_utils2.callOnPageNoTrace)(this.page, (page) => page.waitForEvent("download").catch(import_log.logUnhandledError));
     try {
       await this.page.goto(url, { waitUntil: "domcontentloaded" });
@@ -185,7 +178,6 @@ class Tab extends import_events.EventEmitter {
         url: this.page.url(),
         title: await this.page.title(),
         ariaSnapshot: snapshot,
-        formattedAriaSnapshotDiff: this._lastAriaSnapshot ? generateAriaSnapshotDiff(this._lastAriaSnapshot, snapshot) : void 0,
         modalStates: [],
         consoleMessages: [],
         downloads: this._downloads
@@ -194,7 +186,6 @@ class Tab extends import_events.EventEmitter {
     if (tabSnapshot) {
       tabSnapshot.consoleMessages = this._recentConsoleMessages;
       this._recentConsoleMessages = [];
-      this._lastAriaSnapshot = tabSnapshot.ariaSnapshot;
     }
     return tabSnapshot ?? {
       url: this.page.url(),
@@ -276,23 +267,6 @@ function renderModalStates(context, modalStates) {
   return result;
 }
 const tabSymbol = Symbol("tabSymbol");
-function generateAriaSnapshotDiff(oldSnapshot, newSnapshot) {
-  const diffs = (0, import_utils.diffAriaSnapshots)(import_utilsBundle.yaml, oldSnapshot, newSnapshot);
-  if (diffs === "equal")
-    return "<no changes>";
-  if (diffs === "different")
-    return;
-  if (diffs.length > 3 || diffs.some((diff) => diff.newSource.split("\n").length > 100)) {
-    return;
-  }
-  const lines = [`The following refs have changed`];
-  for (const diff of diffs)
-    lines.push("", "```yaml", diff.newSource.trimEnd(), "```");
-  const combined = lines.join("\n");
-  if (combined.length >= newSnapshot.length)
-    return;
-  return combined;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Tab,

package/lib/mcp/browser/tools/dialogs.js

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dialogs_exports = {};
 __export(dialogs_exports, {
-  default: () => dialogs_default
+  default: () => dialogs_default,
+  handleDialog: () => handleDialog
 });
 module.exports = __toCommonJS(dialogs_exports);
 var import_bundle = require("../../sdk/bundle");
@@ -53,3 +54,7 @@ const handleDialog = (0, import_tool.defineTabTool)({
 var dialogs_default = [
   handleDialog
 ];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handleDialog
+});

package/lib/mcp/browser/tools/files.js

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var files_exports = {};
 __export(files_exports, {
-  default: () => files_default
+  default: () => files_default,
+  uploadFile: () => uploadFile
 });
 module.exports = __toCommonJS(files_exports);
 var import_bundle = require("../../sdk/bundle");
@@ -51,3 +52,7 @@ const uploadFile = (0, import_tool.defineTabTool)({
 var files_default = [
   uploadFile
 ];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  uploadFile
+});

package/lib/mcp/browser/tools/pdf.js

@@ -48,7 +48,7 @@ const pdf = (0, import_tool.defineTabTool)({
     type: "readOnly"
   },
   handle: async (tab, params, response) => {
-    const fileName = await tab.context.outputFile(params.filename ?? `page-${(0, import_utils.dateAsFileName)()}.pdf`, { origin: "llm" });
+    const fileName = await tab.context.outputFile(params.filename ?? (0, import_utils.dateAsFileName)("pdf"), { origin: "llm", reason: "Saving PDF" });
     response.addCode(`await page.pdf(${javascript.formatObject({ path: fileName })});`);
     response.addResult(`Saved page as ${fileName}`);
     await tab.page.pdf({ path: fileName });

package/lib/mcp/browser/tools/screenshot.js

@@ -63,7 +63,7 @@ const screenshot = (0, import_tool.defineTabTool)({
   },
   handle: async (tab, params, response) => {
     const fileType = params.type || "png";
-    const fileName = await tab.context.outputFile(params.filename ?? `page-${(0, import_utils.dateAsFileName)()}.${fileType}`, { origin: "llm" });
+    const fileName = await tab.context.outputFile(params.filename ?? (0, import_utils.dateAsFileName)(fileType), { origin: "llm", reason: "Saving screenshot" });
     const options = {
       type: fileType,
       quality: fileType === "png" ? void 0 : 90,

package/lib/mcp/browser/tools/snapshot.js

@@ -47,7 +47,7 @@ const snapshot = (0, import_tool.defineTool)({
   },
   handle: async (context, params, response) => {
     await context.ensureTab();
-    response.setIncludeSnapshot("full");
+    response.setIncludeSnapshot();
   }
 });
 const elementSchema = import_bundle.z.object({

package/lib/mcp/browser/tools/tracing.js

@@ -34,7 +34,7 @@ const tracingStart = (0, import_tool.defineTool)({
   },
   handle: async (context, params, response) => {
     const browserContext = await context.ensureBrowserContext();
-    const tracesDir = await context.outputFile(`traces`, { origin: "code" });
+    const tracesDir = await context.outputFile(`traces`, { origin: "code", reason: "Collecting trace" });
     const name = "trace-" + Date.now();
     await browserContext.tracing.start({
       name,

package/lib/mcp/browser/tools/utils.js

@@ -83,9 +83,9 @@ async function generateLocator(locator) {
 async function callOnPageNoTrace(page, callback) {
   return await page._wrapApiCall(() => callback(page), { internal: true });
 }
-function dateAsFileName() {
+function dateAsFileName(extension) {
   const date = /* @__PURE__ */ new Date();
-  return date.toISOString().replace(/[:.]/g, "-");
+  return `page-${date.toISOString().replace(/[:.]/g, "-")}.${extension}`;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/mcp/browser/tools.js

@@ -70,6 +70,11 @@ const browserTools = [
   ...import_wait.default,
   ...import_verify.default
 ];
+const customPrefix = process.env.PLAYWRIGHT_MCP_TOOL_PREFIX;
+if (customPrefix) {
+  for (const tool of browserTools)
+    tool.schema.name = customPrefix + tool.schema.name;
+}
 function filteredTools(config) {
   return browserTools.filter((tool) => tool.capability.startsWith("core") || config.capabilities?.includes(tool.capability));
 }

package/lib/mcp/log.js

@@ -23,9 +23,9 @@ __export(log_exports, {
 });
 module.exports = __toCommonJS(log_exports);
 var import_utilsBundle = require("playwright-core/lib/utilsBundle");
-const errorsDebug = (0, import_utilsBundle.debug)("pw:mcp:errors");
+const errorDebug = (0, import_utilsBundle.debug)("pw:mcp:error");
 function logUnhandledError(error) {
-  errorsDebug(error);
+  errorDebug(error);
 }
 const testDebug = (0, import_utilsBundle.debug)("pw:mcp:test");
 // Annotate the CommonJS export names for ESM import in node:

package/lib/mcp/program.js

@@ -41,7 +41,7 @@ var import_browserServerBackend = require("./browser/browserServerBackend");
 var import_extensionContextFactory = require("./extension/extensionContextFactory");
 var import_host = require("./vscode/host");
 function decorateCommand(command, version) {
-  command.option("--allowed-origins <origins>", "semicolon-separated list of origins to allow the browser to request. Default is to allow all.", import_config.semicolonSeparatedList).option("--blocked-origins <origins>", "semicolon-separated list of origins to block the browser from requesting. Blocklist is evaluated before allowlist. If used without the allowlist, requests not matching the blocklist are still allowed.", import_config.semicolonSeparatedList).option("--block-service-workers", "block service workers").option("--browser <browser>", "browser or chrome channel to use, possible values: chrome, firefox, webkit, msedge.").option("--caps <caps>", "comma-separated list of additional capabilities to enable, possible values: vision, pdf.", import_config.commaSeparatedList).option("--cdp-endpoint <endpoint>", "CDP endpoint to connect to.").option("--cdp-header <headers...>", "CDP headers to send with the connect request, multiple can be specified.", import_config.headerParser).option("--config <path>", "path to the configuration file.").option("--device <device>", 'device to emulate, for example: "iPhone 15"').option("--executable-path <path>", "path to the browser executable.").option("--extension", 'Connect to a running browser instance (Edge/Chrome only). Requires the "Playwright MCP Bridge" browser extension to be installed.').option("--grant-permissions <permissions...>", 'List of permissions to grant to the browser context, for example "geolocation", "clipboard-read", "clipboard-write".', import_config.commaSeparatedList).option("--headless", "run browser in headless mode, headed by default").option("--host <host>", "host to bind server to. Default is localhost. Use 0.0.0.0 to bind to all interfaces.").option("--ignore-https-errors", "ignore https errors").option("--init-script <path...>", "path to JavaScript file to add as an initialization script. The script will be evaluated in every page before any of the page's scripts. Can be specified multiple times.").option("--isolated", "keep the browser profile in memory, do not save it to disk.").option("--image-responses <mode>", 'whether to send image responses to the client. Can be "allow" or "omit", Defaults to "allow".').option("--no-sandbox", "disable the sandbox for all process types that are normally sandboxed.").option("--output-dir <path>", "path to the directory for output files.").option("--port <port>", "port to listen on for SSE transport.").option("--proxy-bypass <bypass>", 'comma-separated domains to bypass proxy, for example ".com,chromium.org,.domain.com"').option("--proxy-server <proxy>", 'specify proxy server, for example "http://myproxy:3128" or "socks5://myproxy:8080"').option("--save-session", "Whether to save the Playwright MCP session into the output directory.").option("--save-trace", "Whether to save the Playwright Trace of the session into the output directory.").option("--secrets <path>", "path to a file containing secrets in the dotenv format", import_config.dotenvFileLoader).option("--shared-browser-context", "reuse the same browser context between all connected HTTP clients.").option("--storage-state <path>", "path to the storage state file for isolated sessions.").option("--timeout-action <timeout>", "specify action timeout in milliseconds, defaults to 5000ms", import_config.numberParser).option("--timeout-navigation <timeout>", "specify navigation timeout in milliseconds, defaults to 60000ms", import_config.numberParser).option("--user-agent <ua string>", "specify user agent string").option("--user-data-dir <path>", "path to the user data directory. If not specified, a temporary directory will be created.").option("--viewport-size <size>", 'specify browser viewport size in pixels, for example "1280, 720"').addOption(new import_utilsBundle.ProgramOption("--connect-tool", "Allow to switch between different browser connection methods.").hideHelp()).addOption(new import_utilsBundle.ProgramOption("--vscode", "VS Code tools.").hideHelp()).addOption(new import_utilsBundle.ProgramOption("--vision", "Legacy option, use --caps=vision instead").hideHelp()).action(async (options) => {
+  command.option("--allowed-hosts <hosts...>", "comma-separated list of hosts this server is allowed to serve from. Defaults to the host the server is bound to.", import_config.commaSeparatedList).option("--allowed-origins <origins>", "semicolon-separated list of origins to allow the browser to request. Default is to allow all.", import_config.semicolonSeparatedList).option("--blocked-origins <origins>", "semicolon-separated list of origins to block the browser from requesting. Blocklist is evaluated before allowlist. If used without the allowlist, requests not matching the blocklist are still allowed.", import_config.semicolonSeparatedList).option("--block-service-workers", "block service workers").option("--browser <browser>", "browser or chrome channel to use, possible values: chrome, firefox, webkit, msedge.").option("--caps <caps>", "comma-separated list of additional capabilities to enable, possible values: vision, pdf.", import_config.commaSeparatedList).option("--cdp-endpoint <endpoint>", "CDP endpoint to connect to.").option("--cdp-header <headers...>", "CDP headers to send with the connect request, multiple can be specified.", import_config.headerParser).option("--config <path>", "path to the configuration file.").option("--device <device>", 'device to emulate, for example: "iPhone 15"').option("--executable-path <path>", "path to the browser executable.").option("--extension", 'Connect to a running browser instance (Edge/Chrome only). Requires the "Playwright MCP Bridge" browser extension to be installed.').option("--grant-permissions <permissions...>", 'List of permissions to grant to the browser context, for example "geolocation", "clipboard-read", "clipboard-write".', import_config.commaSeparatedList).option("--headless", "run browser in headless mode, headed by default").option("--host <host>", "host to bind server to. Default is localhost. Use 0.0.0.0 to bind to all interfaces.").option("--ignore-https-errors", "ignore https errors").option("--init-script <path...>", "path to JavaScript file to add as an initialization script. The script will be evaluated in every page before any of the page's scripts. Can be specified multiple times.").option("--isolated", "keep the browser profile in memory, do not save it to disk.").option("--image-responses <mode>", 'whether to send image responses to the client. Can be "allow" or "omit", Defaults to "allow".').option("--no-sandbox", "disable the sandbox for all process types that are normally sandboxed.").option("--output-dir <path>", "path to the directory for output files.").option("--port <port>", "port to listen on for SSE transport.").option("--proxy-bypass <bypass>", 'comma-separated domains to bypass proxy, for example ".com,chromium.org,.domain.com"').option("--proxy-server <proxy>", 'specify proxy server, for example "http://myproxy:3128" or "socks5://myproxy:8080"').option("--save-session", "Whether to save the Playwright MCP session into the output directory.").option("--save-trace", "Whether to save the Playwright Trace of the session into the output directory.").option("--save-video <size>", 'Whether to save the video of the session into the output directory. For example "--save-video=800x600"', import_config.resolutionParser.bind(null, "--save-video")).option("--secrets <path>", "path to a file containing secrets in the dotenv format", import_config.dotenvFileLoader).option("--shared-browser-context", "reuse the same browser context between all connected HTTP clients.").option("--storage-state <path>", "path to the storage state file for isolated sessions.").option("--timeout-action <timeout>", "specify action timeout in milliseconds, defaults to 5000ms", import_config.numberParser).option("--timeout-navigation <timeout>", "specify navigation timeout in milliseconds, defaults to 60000ms", import_config.numberParser).option("--user-agent <ua string>", "specify user agent string").option("--user-data-dir <path>", "path to the user data directory. If not specified, a temporary directory will be created.").option("--viewport-size <size>", 'specify browser viewport size in pixels, for example "1280x720"', import_config.resolutionParser.bind(null, "--viewport-size")).addOption(new import_utilsBundle.ProgramOption("--connect-tool", "Allow to switch between different browser connection methods.").hideHelp()).addOption(new import_utilsBundle.ProgramOption("--vscode", "VS Code tools.").hideHelp()).addOption(new import_utilsBundle.ProgramOption("--vision", "Legacy option, use --caps=vision instead").hideHelp()).action(async (options) => {
     (0, import_watchdog.setupExitWatchdog)();
     if (options.vision) {
       console.error("The --vision option is deprecated, use --caps=vision instead");

package/lib/mcp/sdk/http.js

@@ -67,19 +67,31 @@ function httpAddressToString(address) {
     resolvedHost = "localhost";
   return `http://${resolvedHost}:${resolvedPort}`;
 }
-async function installHttpTransport(httpServer, serverBackendFactory) {
+async function installHttpTransport(httpServer, serverBackendFactory, allowedHosts) {
+  const url = httpAddressToString(httpServer.address());
+  const host = new URL(url).host;
+  allowedHosts = (allowedHosts || [host]).map((h) => h.toLowerCase());
   const sseSessions = /* @__PURE__ */ new Map();
   const streamableSessions = /* @__PURE__ */ new Map();
   httpServer.on("request", async (req, res) => {
-    const url = new URL(`http://localhost${req.url}`);
-    if (url.pathname === "/killkillkill" && req.method === "GET") {
+    const host2 = req.headers.host?.toLowerCase();
+    if (!host2) {
+      res.statusCode = 400;
+      return res.end("Missing host");
+    }
+    if (!allowedHosts.includes(host2)) {
+      res.statusCode = 403;
+      return res.end("Access is only allowed at " + allowedHosts.join(", "));
+    }
+    const url2 = new URL(`http://localhost${req.url}`);
+    if (url2.pathname === "/killkillkill" && req.method === "GET") {
       res.statusCode = 200;
       res.end("Killing process");
       process.emit("SIGINT");
       return;
     }
-    if (url.pathname.startsWith("/sse"))
-      await handleSSE(serverBackendFactory, req, res, url, sseSessions);
+    if (url2.pathname.startsWith("/sse"))
+      await handleSSE(serverBackendFactory, req, res, url2, sseSessions);
     else
       await handleStreamable(serverBackendFactory, req, res, streamableSessions);
   });

package/lib/mcp/sdk/server.js

@@ -124,8 +124,8 @@ async function start(serverBackendFactory, options) {
     return;
   }
   const httpServer = await (0, import_http.startHttpServer)(options);
-  await (0, import_http.installHttpTransport)(httpServer, serverBackendFactory);
   const url = (0, import_http.httpAddressToString)(httpServer.address());
+  await (0, import_http.installHttpTransport)(httpServer, serverBackendFactory, options.allowedHosts);
   const mcpConfig = { mcpServers: {} };
   mcpConfig.mcpServers[serverBackendFactory.nameInConfig] = {
     url: `${url}/mcp`

package/lib/mcp/test/browserBackend.js

@@ -28,8 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var browserBackend_exports = {};
 __export(browserBackend_exports, {
-  runBrowserBackendAtEnd: () => runBrowserBackendAtEnd,
-  runBrowserBackendOnError: () => runBrowserBackendOnError
+  runBrowserBackendAtEnd: () => runBrowserBackendAtEnd
 });
 module.exports = __toCommonJS(browserBackend_exports);
 var mcp = __toESM(require("../sdk/exports"));
@@ -37,42 +36,40 @@ var import_globals = require("../../common/globals");
 var import_util = require("../../util");
 var import_config = require("../browser/config");
 var import_browserServerBackend = require("../browser/browserServerBackend");
-async function runBrowserBackendOnError(page, message) {
+async function runBrowserBackendAtEnd(context, errorMessage) {
   const testInfo = (0, import_globals.currentTestInfo)();
-  if (!testInfo || !testInfo._pauseOnError())
+  if (!testInfo)
     return;
-  const config = {
-    ...import_config.defaultConfig,
-    capabilities: ["testing"]
-  };
-  const snapshot = await page._snapshotForAI();
-  const introMessage = `### Paused on error:
-${(0, import_util.stripAnsiEscapes)(message())}
-
-### Current page snapshot:
-${snapshot}
-
-### Task
-Try recovering from the error prior to continuing`;
-  await mcp.runOnPauseBackendLoop(new import_browserServerBackend.BrowserServerBackend(config, identityFactory(page.context())), introMessage);
-}
-async function runBrowserBackendAtEnd(context) {
-  const testInfo = (0, import_globals.currentTestInfo)();
-  if (!testInfo || !testInfo._pauseAtEnd())
+  const shouldPause = errorMessage ? testInfo?._pauseOnError() : testInfo?._pauseAtEnd();
+  if (!shouldPause)
     return;
-  const page = context.pages()[0];
-  if (!page)
-    return;
-  const snapshot = await page._snapshotForAI();
-  const introMessage = `### Paused at end of test. ready for interaction
-
-### Current page snapshot:
-${snapshot}`;
+  const lines = [];
+  if (errorMessage)
+    lines.push(`### Paused on error:`, (0, import_util.stripAnsiEscapes)(errorMessage));
+  else
+    lines.push(`### Paused at end of test. ready for interaction`);
+  for (let i = 0; i < context.pages().length; i++) {
+    const page = context.pages()[i];
+    const stateSuffix = context.pages().length > 1 ? i + 1 + " of " + context.pages().length : "state";
+    lines.push(
+      "",
+      `### Page ${stateSuffix}`,
+      `- Page URL: ${page.url()}`,
+      `- Page Title: ${await page.title()}`.trim(),
+      `- Page Snapshot:`,
+      "```yaml",
+      await page._snapshotForAI(),
+      "```"
+    );
+  }
+  lines.push("");
+  if (errorMessage)
+    lines.push(`### Task`, `Try recovering from the error prior to continuing`);
   const config = {
     ...import_config.defaultConfig,
     capabilities: ["testing"]
   };
-  await mcp.runOnPauseBackendLoop(new import_browserServerBackend.BrowserServerBackend(config, identityFactory(context)), introMessage);
+  await mcp.runOnPauseBackendLoop(new import_browserServerBackend.BrowserServerBackend(config, identityFactory(context)), lines.join("\n"));
 }
 function identityFactory(browserContext) {
   return {
@@ -87,6 +84,5 @@ function identityFactory(browserContext) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  runBrowserBackendAtEnd,
-  runBrowserBackendOnError
+  runBrowserBackendAtEnd
 });

package/lib/worker/testInfo.js

@@ -50,6 +50,7 @@ class TestInfoImpl {
     this._lastStepId = 0;
     this._steps = [];
     this._stepMap = /* @__PURE__ */ new Map();
+    this._onDidFinishTestFunctions = [];
     this._hasNonRetriableError = false;
     this._hasUnhandledError = false;
     this._allowSkips = false;

package/lib/worker/workerMain.js

@@ -318,7 +318,10 @@ class WorkerMain extends import_process.ProcessRunner {
     await testInfo._runAsStep({ title: "After Hooks", category: "hook" }, async () => {
       let firstAfterHooksError;
       try {
-        await testInfo._runWithTimeout({ type: "test", slot: afterHooksSlot }, async () => testInfo._onDidFinishTestFunction?.());
+        await testInfo._runWithTimeout({ type: "test", slot: afterHooksSlot }, async () => {
+          for (const fn of testInfo._onDidFinishTestFunctions)
+            await fn();
+        });
       } catch (error) {
         firstAfterHooksError = firstAfterHooksError ?? error;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playwright",
-  "version": "1.56.0-alpha-2025-09-23",
+  "version": "1.56.0-alpha-2025-09-24",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -64,7 +64,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright-core": "1.56.0-alpha-2025-09-23"
+    "playwright-core": "1.56.0-alpha-2025-09-24"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"