playwright 1.58.0-alpha-2025-12-10 → 1.58.0-alpha-2025-12-12

package/lib/agents/agent.js

@@ -33,7 +33,7 @@ class Agent {
     const { clients, tools, callTool } = await this._initClients();
     const prompt = this.spec.description;
     try {
-      return await this.loop.run(`${prompt}
+      const { result } = await this.loop.run(`${prompt}
 
 Task:
 ${task}
@@ -45,6 +45,7 @@ ${JSON.stringify(params, null, 2)}`, {
         callTool,
         resultSchema: this.resultSchema
       });
+      return result;
     } finally {
       await this._disconnectFromServers(clients);
     }

package/lib/agents/playwright-test-planner.agent.md

@@ -17,6 +17,7 @@ tools:
   - playwright-test/browser_navigate_back
   - playwright-test/browser_network_requests
   - playwright-test/browser_press_key
+  - playwright-test/browser_run_code
   - playwright-test/browser_select_option
   - playwright-test/browser_snapshot
   - playwright-test/browser_take_screenshot

package/lib/index.js

@@ -212,37 +212,26 @@ const playwrightFixtures = {
       options.baseURL = baseURL;
     if (serviceWorkers !== void 0)
       options.serviceWorkers = serviceWorkers;
-    const workerFile = agent?.cacheFile && agent.cacheMode !== "ignore" ? await testInfo._cloneStorage(agent.cacheFile) : void 0;
-    if (agent && workerFile) {
-      options.agent = {
-        ...agent,
-        cacheFile: workerFile
-      };
-    }
     await use({
       ...contextOptions,
       ...options
     });
-    if (workerFile)
-      await testInfo._upstreamStorage(workerFile);
   }, { box: true }],
-  _setupContextOptions: [async ({ playwright, _combinedContextOptions, actionTimeout, navigationTimeout, testIdAttribute }, use, testInfo) => {
+  _setupContextOptions: [async ({ playwright, actionTimeout, navigationTimeout, testIdAttribute }, use, testInfo) => {
     if (testIdAttribute)
       playwrightLibrary.selectors.setTestIdAttribute(testIdAttribute);
     testInfo.snapshotSuffix = process.platform;
     if ((0, import_utils.debugMode)() === "inspector")
       testInfo._setDebugMode();
-    playwright._defaultContextOptions = _combinedContextOptions;
     playwright._defaultContextTimeout = actionTimeout || 0;
     playwright._defaultContextNavigationTimeout = navigationTimeout || 0;
     await use();
-    playwright._defaultContextOptions = void 0;
     playwright._defaultContextTimeout = void 0;
     playwright._defaultContextNavigationTimeout = void 0;
   }, { auto: "all-hooks-included", title: "context configuration", box: true }],
-  _setupArtifacts: [async ({ playwright, screenshot }, use, testInfo) => {
+  _setupArtifacts: [async ({ playwright, screenshot, _combinedContextOptions, agent }, use, testInfo) => {
     testInfo.setTimeout(testInfo.project.timeout);
-    const artifactsRecorder = new ArtifactsRecorder(playwright, tracing().artifactsDir(), screenshot);
+    const artifactsRecorder = new ArtifactsRecorder(playwright, tracing().artifactsDir(), screenshot, agent);
     await artifactsRecorder.willStartTest(testInfo);
     const tracingGroupSteps = [];
     const csiListener = {
@@ -288,20 +277,33 @@ const playwrightFixtures = {
         if (!keepTestTimeout)
           (0, import_globals.currentTestInfo)()?._setDebugMode();
       },
+      runBeforeCreateBrowserContext: async (options) => {
+        for (const [key, value] of Object.entries(_combinedContextOptions)) {
+          if (!(key in options))
+            options[key] = value;
+        }
+        await artifactsRecorder.willCreateBrowserContext(options);
+      },
+      runBeforeCreateRequestContext: async (options) => {
+        for (const [key, value] of Object.entries(_combinedContextOptions)) {
+          if (!(key in options))
+            options[key] = value;
+        }
+      },
       runAfterCreateBrowserContext: async (context) => {
-        await artifactsRecorder?.didCreateBrowserContext(context);
+        await artifactsRecorder.didCreateBrowserContext(context);
         const testInfo2 = (0, import_globals.currentTestInfo)();
         if (testInfo2)
           attachConnectedHeaderIfNeeded(testInfo2, context.browser());
       },
       runAfterCreateRequestContext: async (context) => {
-        await artifactsRecorder?.didCreateRequestContext(context);
+        await artifactsRecorder.didCreateRequestContext(context);
       },
       runBeforeCloseBrowserContext: async (context) => {
-        await artifactsRecorder?.willCloseBrowserContext(context);
+        await artifactsRecorder.willCloseBrowserContext(context);
       },
       runBeforeCloseRequestContext: async (context) => {
-        await artifactsRecorder?.willCloseRequestContext(context);
+        await artifactsRecorder.willCloseRequestContext(context);
       }
     };
     const clientInstrumentation = playwright._instrumentation;
@@ -560,9 +562,10 @@ class SnapshotRecorder {
   }
 }
 class ArtifactsRecorder {
-  constructor(playwright, artifactsDir, screenshot) {
+  constructor(playwright, artifactsDir, screenshot, agent) {
     this._playwright = playwright;
     this._artifactsDir = artifactsDir;
+    this._agent = agent;
     const screenshotOptions = typeof screenshot === "string" ? void 0 : screenshot;
     this._startedCollectingArtifacts = Symbol("startedCollectingArtifacts");
     this._screenshotRecorder = new SnapshotRecorder(this, normalizeScreenshotMode(screenshot), "screenshot", "image/png", ".png", async (page, path2) => {
@@ -582,10 +585,14 @@ class ArtifactsRecorder {
   async didCreateBrowserContext(context) {
     await this._startTraceChunkOnContextCreation(context, context.tracing);
   }
+  async willCreateBrowserContext(options) {
+    await this._cloneAgentCache(options);
+  }
   async willCloseBrowserContext(context) {
     await this._stopTracing(context, context.tracing);
     await this._screenshotRecorder.captureTemporary(context);
     await this._takePageSnapshot(context);
+    await this._upstreamAgentCache(context);
   }
   async _takePageSnapshot(context) {
     if (process.env.PLAYWRIGHT_NO_COPY_PROMPT)
@@ -604,6 +611,21 @@ class ArtifactsRecorder {
     } catch {
     }
   }
+  async _cloneAgentCache(options) {
+    if (!this._agent || this._agent.cacheMode === "ignore")
+      return;
+    if (!this._agent.cacheFile && !this._agent.cachePathTemplate)
+      return;
+    const cacheFile = this._agent.cacheFile ?? this._testInfo._applyPathTemplate(this._agent.cachePathTemplate, "cache", ".json");
+    const workerFile = await this._testInfo._cloneStorage(cacheFile);
+    if (this._agent && workerFile)
+      options.agent = { ...this._agent, cacheFile: workerFile };
+  }
+  async _upstreamAgentCache(context) {
+    const agent = context._options.agent;
+    if (this._testInfo.status === "passed" && agent?.cacheFile)
+      await this._testInfo._upstreamStorage(agent.cacheFile);
+  }
   async didCreateRequestContext(context) {
     await this._startTraceChunkOnContextCreation(context, context._tracing);
   }

package/lib/mcp/browser/context.js

@@ -34,12 +34,12 @@ __export(context_exports, {
 module.exports = __toCommonJS(context_exports);
 var import_fs = __toESM(require("fs"));
 var import_utilsBundle = require("playwright-core/lib/utilsBundle");
+var import_utils = require("playwright-core/lib/utils");
 var import_playwright_core = require("playwright-core");
 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");
+var import_utils2 = require("./tools/utils");
 const testDebug = (0, import_utilsBundle.debug)("pw:mcp:test");
 class Context {
   constructor(options) {
@@ -141,7 +141,7 @@ class Context {
       const videos = this.config.saveVideo ? 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" });
+          const name = await this.outputFile((0, import_utils2.dateAsFileName)("webm"), { origin: "code", reason: "Saving video" });
           const p = await video.path();
           if (import_fs.default.existsSync(p)) {
             try {
@@ -215,7 +215,7 @@ class Context {
   }
   lookupSecret(secretName) {
     if (!this.config.secrets?.[secretName])
-      return { value: secretName, code: codegen.quote(secretName) };
+      return { value: secretName, code: (0, import_utils.escapeWithQuotes)(secretName, "'") };
     return {
       value: this.config.secrets[secretName],
       code: `process.env['${secretName}']`

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var evaluate_exports = {};
 __export(evaluate_exports, {
@@ -32,8 +22,8 @@ __export(evaluate_exports, {
 });
 module.exports = __toCommonJS(evaluate_exports);
 var import_mcpBundle = require("playwright-core/lib/mcpBundle");
+var import_utils = require("playwright-core/lib/utils");
 var import_tool = require("./tool");
-var javascript = __toESM(require("../codegen"));
 const evaluateSchema = import_mcpBundle.z.object({
   function: import_mcpBundle.z.string().describe("() => { /* code */ } or (element) => { /* code */ } when element is provided"),
   element: import_mcpBundle.z.string().optional().describe("Human-readable element description used to obtain permission to interact with the element"),
@@ -53,9 +43,9 @@ const evaluate = (0, import_tool.defineTabTool)({
     let locator;
     if (params.ref && params.element) {
       locator = await tab.refLocator({ ref: params.ref, element: params.element });
-      response.addCode(`await page.${locator.resolved}.evaluate(${javascript.quote(params.function)});`);
+      response.addCode(`await page.${locator.resolved}.evaluate(${(0, import_utils.escapeWithQuotes)(params.function)});`);
     } else {
-      response.addCode(`await page.evaluate(${javascript.quote(params.function)});`);
+      response.addCode(`await page.evaluate(${(0, import_utils.escapeWithQuotes)(params.function)});`);
     }
     await tab.waitForCompletion(async () => {
       const receiver = locator?.locator ?? tab.page;

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var form_exports = {};
 __export(form_exports, {
@@ -32,8 +22,8 @@ __export(form_exports, {
 });
 module.exports = __toCommonJS(form_exports);
 var import_mcpBundle = require("playwright-core/lib/mcpBundle");
+var import_utils = require("playwright-core/lib/utils");
 var import_tool = require("./tool");
-var codegen = __toESM(require("../codegen"));
 const fillForm = (0, import_tool.defineTabTool)({
   capability: "core",
   schema: {
@@ -63,7 +53,7 @@ const fillForm = (0, import_tool.defineTabTool)({
         response.addCode(`${locatorSource}.setChecked(${field.value});`);
       } else if (field.type === "combobox") {
         await locator.selectOption({ label: field.value });
-        response.addCode(`${locatorSource}.selectOption(${codegen.quote(field.value)});`);
+        response.addCode(`${locatorSource}.selectOption(${(0, import_utils.escapeWithQuotes)(field.value)});`);
       }
     }
   }

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var pdf_exports = {};
 __export(pdf_exports, {
@@ -32,9 +22,9 @@ __export(pdf_exports, {
 });
 module.exports = __toCommonJS(pdf_exports);
 var import_mcpBundle = require("playwright-core/lib/mcpBundle");
+var import_utils = require("playwright-core/lib/utils");
 var import_tool = require("./tool");
-var javascript = __toESM(require("../codegen"));
-var import_utils = require("./utils");
+var import_utils2 = require("./utils");
 const pdfSchema = import_mcpBundle.z.object({
   filename: import_mcpBundle.z.string().optional().describe("File name to save the pdf to. Defaults to `page-{timestamp}.pdf` if not specified. Prefer relative file names to stay within the output directory.")
 });
@@ -48,8 +38,8 @@ const pdf = (0, import_tool.defineTabTool)({
     type: "readOnly"
   },
   handle: async (tab, params, response) => {
-    const fileName = await response.addFile(params.filename ?? (0, import_utils.dateAsFileName)("pdf"), { origin: "llm", reason: "Page saved as PDF" });
-    response.addCode(`await page.pdf(${javascript.formatObject({ path: fileName })});`);
+    const fileName = await response.addFile(params.filename ?? (0, import_utils2.dateAsFileName)("pdf"), { origin: "llm", reason: "Page saved as PDF" });
+    response.addCode(`await page.pdf(${(0, import_utils.formatObject)({ path: fileName })});`);
     await tab.page.pdf({ path: fileName });
   }
 });

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

@@ -36,7 +36,7 @@ var import_utils = require("playwright-core/lib/utils");
 var import_mcpBundle = require("playwright-core/lib/mcpBundle");
 var import_tool = require("./tool");
 const codeSchema = import_mcpBundle.z.object({
-  code: import_mcpBundle.z.string().describe(`Playwright code snippet to run. The snippet should access the \`page\` object to interact with the page. Can make multiple statements. For example: \`await page.getByRole('button', { name: 'Submit' }).click();\``)
+  code: import_mcpBundle.z.string().describe(`A JavaScript function containing Playwright code to execute. It will be invoked with a single argument, page, which you can use for any page interaction. For example: \`async (page) => { await page.getByRole('button', { name: 'Submit' }).click(); return await page.title(); }\``)
 });
 const runCode = (0, import_tool.defineTabTool)({
   capability: "core",
@@ -49,7 +49,7 @@ const runCode = (0, import_tool.defineTabTool)({
   },
   handle: async (tab, params, response) => {
     response.setIncludeSnapshot();
-    response.addCode(params.code);
+    response.addCode(`await (${params.code})(page);`);
     const __end__ = new import_utils.ManualPromise();
     const context = {
       page: tab.page,
@@ -59,14 +59,16 @@ const runCode = (0, import_tool.defineTabTool)({
     await tab.waitForCompletion(async () => {
       const snippet = `(async () => {
         try {
-          ${params.code};
-          __end__.resolve();
+          const result = await (${params.code})(page);
+          __end__.resolve(JSON.stringify(result));
         } catch (e) {
           __end__.reject(e);
         }
       })()`;
-      import_vm.default.runInContext(snippet, context);
-      await __end__;
+      await import_vm.default.runInContext(snippet, context);
+      const result = await __end__;
+      if (typeof result === "string")
+        response.addResult(result);
     });
   }
 });

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

@@ -35,10 +35,10 @@ module.exports = __toCommonJS(screenshot_exports);
 var import_fs = __toESM(require("fs"));
 var import_utils = require("playwright-core/lib/utils");
 var import_utilsBundle = require("playwright-core/lib/utilsBundle");
+var import_utils2 = require("playwright-core/lib/utils");
 var import_mcpBundle = require("playwright-core/lib/mcpBundle");
 var import_tool = require("./tool");
-var javascript = __toESM(require("../codegen"));
-var import_utils2 = require("./utils");
+var import_utils3 = require("./utils");
 const screenshotSchema = import_mcpBundle.z.object({
   type: import_mcpBundle.z.enum(["png", "jpeg"]).default("png").describe("Image format for the screenshot. Default is png."),
   filename: import_mcpBundle.z.string().optional().describe("File name to save the screenshot to. Defaults to `page-{timestamp}.{png|jpeg}` if not specified. Prefer relative file names to stay within the output directory."),
@@ -69,13 +69,13 @@ const screenshot = (0, import_tool.defineTabTool)({
     };
     const isElementScreenshot = params.element && params.ref;
     const screenshotTarget = isElementScreenshot ? params.element : params.fullPage ? "full page" : "viewport";
-    const fileName = await response.addFile(params.filename || (0, import_utils2.dateAsFileName)(fileType), { origin: "llm", reason: `Screenshot of ${screenshotTarget}` });
+    const fileName = await response.addFile(params.filename || (0, import_utils3.dateAsFileName)(fileType), { origin: "llm", reason: `Screenshot of ${screenshotTarget}` });
     response.addCode(`// Screenshot ${screenshotTarget} and save it as ${fileName}`);
     const ref = params.ref ? await tab.refLocator({ element: params.element || "", ref: params.ref }) : null;
     if (ref)
-      response.addCode(`await page.${ref.resolved}.screenshot(${javascript.formatObject(options)});`);
+      response.addCode(`await page.${ref.resolved}.screenshot(${(0, import_utils2.formatObject)(options)});`);
     else
-      response.addCode(`await page.screenshot(${javascript.formatObject(options)});`);
+      response.addCode(`await page.screenshot(${(0, import_utils2.formatObject)(options)});`);
     const buffer = ref ? await ref.locator.screenshot(options) : await tab.page.screenshot(options);
     await (0, import_utils.mkdirIfNeeded)(fileName);
     await import_fs.default.promises.writeFile(fileName, buffer);

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

@@ -34,8 +34,8 @@ __export(snapshot_exports, {
 module.exports = __toCommonJS(snapshot_exports);
 var import_fs = __toESM(require("fs"));
 var import_mcpBundle = require("playwright-core/lib/mcpBundle");
+var import_utils = require("playwright-core/lib/utils");
 var import_tool = require("./tool");
-var javascript = __toESM(require("../codegen"));
 const snapshot = (0, import_tool.defineTool)({
   capability: "core",
   schema: {
@@ -83,7 +83,7 @@ const click = (0, import_tool.defineTabTool)({
       button: params.button,
       modifiers: params.modifiers
     };
-    const formatted = javascript.formatObject(options, " ", "oneline");
+    const formatted = (0, import_utils.formatObject)(options, " ", "oneline");
     const optionsAttr = formatted !== "{}" ? formatted : "";
     if (params.doubleClick)
       response.addCode(`await page.${resolved}.dblclick(${optionsAttr});`);
@@ -156,7 +156,7 @@ const selectOption = (0, import_tool.defineTabTool)({
   handle: async (tab, params, response) => {
     response.setIncludeSnapshot();
     const { locator, resolved } = await tab.refLocator(params);
-    response.addCode(`await page.${resolved}.selectOption(${javascript.formatObject(params.values)});`);
+    response.addCode(`await page.${resolved}.selectOption(${(0, import_utils.formatObject)(params.values)});`);
     await tab.waitForCompletion(async () => {
       await locator.selectOption(params.values);
     });

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var verify_exports = {};
 __export(verify_exports, {
@@ -32,8 +22,8 @@ __export(verify_exports, {
 });
 module.exports = __toCommonJS(verify_exports);
 var import_mcpBundle = require("playwright-core/lib/mcpBundle");
+var import_utils = require("playwright-core/lib/utils");
 var import_tool = require("./tool");
-var javascript = __toESM(require("../codegen"));
 const verifyElement = (0, import_tool.defineTabTool)({
   capability: "testing",
   schema: {
@@ -52,7 +42,7 @@ const verifyElement = (0, import_tool.defineTabTool)({
       response.addError(`Element with role "${params.role}" and accessible name "${params.accessibleName}" not found`);
       return;
     }
-    response.addCode(`await expect(page.getByRole(${javascript.escapeWithQuotes(params.role)}, { name: ${javascript.escapeWithQuotes(params.accessibleName)} })).toBeVisible();`);
+    response.addCode(`await expect(page.getByRole(${(0, import_utils.escapeWithQuotes)(params.role)}, { name: ${(0, import_utils.escapeWithQuotes)(params.accessibleName)} })).toBeVisible();`);
     response.addResult("Done");
   }
 });
@@ -73,7 +63,7 @@ const verifyText = (0, import_tool.defineTabTool)({
       response.addError("Text not found");
       return;
     }
-    response.addCode(`await expect(page.getByText(${javascript.escapeWithQuotes(params.text)})).toBeVisible();`);
+    response.addCode(`await expect(page.getByText(${(0, import_utils.escapeWithQuotes)(params.text)})).toBeVisible();`);
     response.addResult("Done");
   }
 });
@@ -103,7 +93,7 @@ const verifyList = (0, import_tool.defineTabTool)({
     }
     const ariaSnapshot = `\`
 - list:
-${itemTexts.map((t) => `  - listitem: ${javascript.escapeWithQuotes(t, '"')}`).join("\n")}
+${itemTexts.map((t) => `  - listitem: ${(0, import_utils.escapeWithQuotes)(t, '"')}`).join("\n")}
 \``;
     response.addCode(`await expect(page.locator('body')).toMatchAriaSnapshot(${ariaSnapshot});`);
     response.addResult("Done");
@@ -132,7 +122,7 @@ const verifyValue = (0, import_tool.defineTabTool)({
         response.addError(`Expected value "${params.value}", but got "${value}"`);
         return;
       }
-      response.addCode(`await expect(${locatorSource}).toHaveValue(${javascript.quote(params.value)});`);
+      response.addCode(`await expect(${locatorSource}).toHaveValue(${(0, import_utils.escapeWithQuotes)(params.value)});`);
     } else if (params.type === "checkbox" || params.type === "radio") {
       const value = await locator.isChecked();
       if (value !== (params.value === "true")) {

package/lib/worker/testInfo.js

@@ -342,13 +342,13 @@ ${(0, import_utils.stringifyStackFrames)(step.boxedStack).join("\n")}`;
         this._callbacks.onTestPaused({ testId: this.testId, stepId: step.stepId, errors: this._isFailure() ? this.errors : [] }),
         this._interruptedPromise.then(() => "interrupted")
       ]);
-      step.complete({});
       if (result !== "interrupted") {
         if (result.action === "abort")
           this._interrupt();
         if (result.action === void 0)
           await this._interruptedPromise;
       }
+      step.complete({});
     }
     await this._onDidFinishTestFunctionCallback?.();
   }
@@ -445,10 +445,6 @@ ${(0, import_utils.stringifyStackFrames)(step.boxedStack).join("\n")}`;
       if (index > 1)
         relativeOutputPath = (0, import_util.addSuffixToFilePath)(relativeOutputPath, `-${index - 1}`);
     }
-    const absoluteSnapshotPath = this._applyPathTemplate(kind, subPath, ext);
-    return { absoluteSnapshotPath, relativeOutputPath };
-  }
-  _applyPathTemplate(kind, relativePath, ext) {
     const legacyTemplate = "{snapshotDir}/{testFileDir}/{testFileName}-snapshots/{arg}{-projectName}{-snapshotSuffix}{ext}";
     let template;
     if (kind === "screenshot") {
@@ -459,12 +455,15 @@ ${(0, import_utils.stringifyStackFrames)(step.boxedStack).join("\n")}`;
     } else {
       template = this._projectInternal.snapshotPathTemplate || legacyTemplate;
     }
-    const dir = import_path.default.dirname(relativePath);
-    const name = import_path.default.basename(relativePath, ext);
+    const nameArgument = import_path.default.join(import_path.default.dirname(subPath), import_path.default.basename(subPath, ext));
+    const absoluteSnapshotPath = this._applyPathTemplate(template, nameArgument, ext);
+    return { absoluteSnapshotPath, relativeOutputPath };
+  }
+  _applyPathTemplate(template, nameArgument, ext) {
     const relativeTestFilePath = import_path.default.relative(this.project.testDir, this._requireFile);
     const parsedRelativeTestFilePath = import_path.default.parse(relativeTestFilePath);
     const projectNamePathSegment = (0, import_utils.sanitizeForFilePath)(this.project.name);
-    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 : "").replace(/\{(.)?testFileDir\}/g, "$1" + parsedRelativeTestFilePath.dir).replace(/\{(.)?platform\}/g, "$1" + process.platform).replace(/\{(.)?projectName\}/g, projectNamePathSegment ? "$1" + projectNamePathSegment : "").replace(/\{(.)?testName\}/g, "$1" + this._fsSanitizedTestName()).replace(/\{(.)?testFileName\}/g, "$1" + parsedRelativeTestFilePath.base).replace(/\{(.)?testFilePath\}/g, "$1" + relativeTestFilePath).replace(/\{(.)?arg\}/g, "$1" + import_path.default.join(dir, name)).replace(/\{(.)?ext\}/g, ext ? "$1" + ext : "");
+    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 : "").replace(/\{(.)?testFileDir\}/g, "$1" + parsedRelativeTestFilePath.dir).replace(/\{(.)?platform\}/g, "$1" + process.platform).replace(/\{(.)?projectName\}/g, projectNamePathSegment ? "$1" + projectNamePathSegment : "").replace(/\{(.)?testName\}/g, "$1" + this._fsSanitizedTestName()).replace(/\{(.)?testFileName\}/g, "$1" + parsedRelativeTestFilePath.base).replace(/\{(.)?testFilePath\}/g, "$1" + relativeTestFilePath).replace(/\{(.)?arg\}/g, "$1" + nameArgument).replace(/\{(.)?ext\}/g, ext ? "$1" + ext : "");
     return import_path.default.normalize(import_path.default.resolve(this._configInternal.configDir, snapshotPath));
   }
   snapshotPath(...args) {
@@ -482,7 +481,8 @@ ${(0, import_utils.stringifyStackFrames)(step.boxedStack).join("\n")}`;
   setTimeout(timeout) {
     this._timeoutManager.setTimeout(timeout);
   }
-  async _cloneStorage(storageFile) {
+  async _cloneStorage(cacheFileTemplate) {
+    const storageFile = this._applyPathTemplate(cacheFileTemplate, "cache", ".json");
     return await this._callbacks.onCloneStorage?.({ storageFile });
   }
   async _upstreamStorage(workerFile) {

package/package.json

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

package/types/test.d.ts

@@ -6644,7 +6644,7 @@ export type Fixtures<T extends {} = {}, W extends {} = {}, PT extends {} = {}, P
   [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 | 'self' }];
 };
 
-type Agent = Exclude<BrowserContextOptions['agent'], undefined> | undefined;
+type Agent = Exclude<BrowserContextOptions['agent'], undefined> & { cachePathTemplate?: string } | undefined;
 type BrowserName = 'chromium' | 'firefox' | 'webkit';
 type BrowserChannel = Exclude<LaunchOptions['channel'], undefined>;
 type ColorScheme = Exclude<BrowserContextOptions['colorScheme'], undefined>;

package/lib/mcp/browser/codegen.js

@@ -1,66 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var codegen_exports = {};
-__export(codegen_exports, {
-  escapeWithQuotes: () => escapeWithQuotes,
-  formatObject: () => formatObject,
-  quote: () => quote
-});
-module.exports = __toCommonJS(codegen_exports);
-function escapeWithQuotes(text, char = "'") {
-  const stringified = JSON.stringify(text);
-  const escapedText = stringified.substring(1, stringified.length - 1).replace(/\\"/g, '"');
-  if (char === "'")
-    return char + escapedText.replace(/[']/g, "\\'") + char;
-  if (char === '"')
-    return char + escapedText.replace(/["]/g, '\\"') + char;
-  if (char === "`")
-    return char + escapedText.replace(/[`]/g, "\\`") + char;
-  throw new Error("Invalid escape char");
-}
-function quote(text) {
-  return escapeWithQuotes(text, "'");
-}
-function formatObject(value, indent = "  ", mode = "multiline") {
-  if (typeof value === "string")
-    return quote(value);
-  if (Array.isArray(value))
-    return `[${value.map((o) => formatObject(o)).join(", ")}]`;
-  if (typeof value === "object") {
-    const keys = Object.keys(value).filter((key) => value[key] !== void 0).sort();
-    if (!keys.length)
-      return "{}";
-    const tokens = [];
-    for (const key of keys)
-      tokens.push(`${key}: ${formatObject(value[key])}`);
-    if (mode === "multiline")
-      return `{
-${tokens.join(`,
-${indent}`)}
-}`;
-    return `{ ${tokens.join(", ")} }`;
-  }
-  return String(value);
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  escapeWithQuotes,
-  formatObject,
-  quote
-});