playwright 1.56.1 → 1.57.0

package/lib/common/testLoader.js

@@ -42,12 +42,13 @@ var import_transform = require("../transform/transform");
 var import_util2 = require("../util");
 const defaultTimeout = 3e4;
 const cachedFileSuites = /* @__PURE__ */ new Map();
-async function loadTestFile(file, rootDir, testErrors) {
+async function loadTestFile(file, config, testErrors) {
   if (cachedFileSuites.has(file))
     return cachedFileSuites.get(file);
-  const suite = new import_test.Suite(import_path.default.relative(rootDir, file) || import_path.default.basename(file), "file");
+  const suite = new import_test.Suite(import_path.default.relative(config.config.rootDir, file) || import_path.default.basename(file), "file");
   suite._requireFile = file;
   suite.location = { file, line: 0, column: 0 };
+  suite._tags = [...config.config.tags];
   (0, import_globals.setCurrentlyLoadingFileSuite)(suite);
   if (!(0, import_globals.isWorkerProcess)()) {
     (0, import_compilationCache.startCollectingFileDeps)();

package/lib/common/testType.js

@@ -29,6 +29,7 @@ var import_globals = require("./globals");
 var import_test = require("./test");
 var import_expect = require("../matchers/expect");
 var import_transform = require("../transform/transform");
+var import_validators = require("./validators");
 const testTypeSymbol = Symbol("testType");
 class TestTypeImpl {
   constructor(fixtures) {
@@ -96,7 +97,7 @@ class TestTypeImpl {
       body = fn;
       details = fnOrDetails;
     }
-    const validatedDetails = validateTestDetails(details, location);
+    const validatedDetails = (0, import_validators.validateTestDetails)(details, location);
     const test = new import_test.TestCase(title, body, this, location);
     test._requireFile = suite._requireFile;
     test.annotations.push(...validatedDetails.annotations);
@@ -130,7 +131,7 @@ class TestTypeImpl {
       details = fnOrDetails;
       body = fn;
     }
-    const validatedDetails = validateTestDetails(details, location);
+    const validatedDetails = (0, import_validators.validateTestDetails)(details, location);
     const child = new import_test.Suite(title, "describe");
     child._requireFile = suite._requireFile;
     child.location = location;
@@ -276,16 +277,6 @@ See https://playwright.dev/docs/intro for more information about Playwright Test
     );
   }
 }
-function validateTestDetails(details, 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] !== "@")
-      throw new Error(`Tag must start with "@" symbol, got "${tag}" instead.`);
-  }
-  return { annotations, tags };
-}
 const rootTestType = new TestTypeImpl([]);
 function mergeTests(...tests) {
   let result = rootTestType;

package/lib/common/validators.js

@@ -0,0 +1,68 @@
+"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 validators_exports = {};
+__export(validators_exports, {
+  validateTestAnnotation: () => validateTestAnnotation,
+  validateTestDetails: () => validateTestDetails
+});
+module.exports = __toCommonJS(validators_exports);
+var import_utilsBundle = require("playwright-core/lib/utilsBundle");
+const testAnnotationSchema = import_utilsBundle.zod.object({
+  type: import_utilsBundle.zod.string(),
+  description: import_utilsBundle.zod.string().optional()
+});
+const testDetailsSchema = import_utilsBundle.zod.object({
+  tag: import_utilsBundle.zod.union([
+    import_utilsBundle.zod.string().optional(),
+    import_utilsBundle.zod.array(import_utilsBundle.zod.string())
+  ]).transform((val) => Array.isArray(val) ? val : val !== void 0 ? [val] : []).refine((val) => val.every((v) => v.startsWith("@")), {
+    message: "Tag must start with '@'"
+  }),
+  annotation: import_utilsBundle.zod.union([
+    testAnnotationSchema,
+    import_utilsBundle.zod.array(testAnnotationSchema).optional()
+  ]).transform((val) => Array.isArray(val) ? val : val !== void 0 ? [val] : [])
+});
+function validateTestAnnotation(annotation) {
+  try {
+    return testAnnotationSchema.parse(annotation);
+  } catch (error) {
+    throwZodError(error);
+  }
+}
+function validateTestDetails(details, location) {
+  try {
+    const parsedDetails = testDetailsSchema.parse(details);
+    return {
+      annotations: parsedDetails.annotation.map((a) => ({ ...a, location })),
+      tags: parsedDetails.tag,
+      location
+    };
+  } catch (error) {
+    throwZodError(error);
+  }
+}
+function throwZodError(error) {
+  throw new Error(error.issues.map((i) => i.message).join("\n"));
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  validateTestAnnotation,
+  validateTestDetails
+});

package/lib/index.js

@@ -89,8 +89,8 @@ const playwrightFixtures = {
     await use(options);
     playwright._defaultLaunchOptions = void 0;
   }, { scope: "worker", auto: true, box: true }],
-  browser: [async ({ playwright, browserName, _browserOptions, connectOptions }, use, testInfo) => {
-    if (!["chromium", "firefox", "webkit", "_bidiChromium", "_bidiFirefox"].includes(browserName))
+  browser: [async ({ playwright, browserName, _browserOptions, connectOptions }, use) => {
+    if (!["chromium", "firefox", "webkit"].includes(browserName))
       throw new Error(`Unexpected browserName "${browserName}", must be one of "chromium", "firefox" or "webkit"`);
     if (connectOptions) {
       const browser2 = await playwright[browserName].connect({
@@ -220,7 +220,7 @@ const playwrightFixtures = {
     if ((0, import_utils.debugMode)() === "inspector")
       testInfo._setDebugMode();
     playwright._defaultContextOptions = _combinedContextOptions;
-    playwright._defaultContextTimeout = testInfo._pauseOnError() ? 5e3 : actionTimeout || 0;
+    playwright._defaultContextTimeout = actionTimeout || 0;
     playwright._defaultContextNavigationTimeout = navigationTimeout || 0;
     await use();
     playwright._defaultContextOptions = void 0;
@@ -242,8 +242,8 @@ const playwrightFixtures = {
         if (zone && zone.category === "expect" && isExpectCall) {
           if (zone.apiName)
             data.apiName = zone.apiName;
-          if (zone.title)
-            data.title = zone.title;
+          if (zone.shortTitle || zone.title)
+            data.title = zone.shortTitle ?? zone.title;
           data.stepId = zone.stepId;
           return;
         }
@@ -380,13 +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));
+      testInfo._onCustomMessageCallback = (0, import_browserBackend.createCustomMessageHandler)(testInfo, context2);
       await use(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));
+    testInfo._onCustomMessageCallback = (0, import_browserBackend.createCustomMessageHandler)(testInfo, context);
     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 });
@@ -560,7 +560,7 @@ class ArtifactsRecorder {
   }
   async willStartTest(testInfo) {
     this._testInfo = testInfo;
-    testInfo._onDidFinishTestFunctions.push(() => this.didFinishTestFunction());
+    testInfo._onDidFinishTestFunctionCallback = () => this.didFinishTestFunction();
     this._screenshotRecorder.fixOrdinal();
     await Promise.all(this._playwright._allContexts().map((context) => this.didCreateBrowserContext(context)));
     const existingApiRequests = Array.from(this._playwright.request._contexts);
@@ -586,7 +586,7 @@ class ArtifactsRecorder {
       return;
     try {
       await page._wrapApiCall(async () => {
-        this._pageSnapshot = await page._snapshotForAI({ timeout: 5e3 });
+        this._pageSnapshot = (await page._snapshotForAI({ timeout: 5e3 })).full;
       }, { internal: true });
     } catch {
     }

package/lib/isomorphic/teleReceiver.js

@@ -445,6 +445,7 @@ const baseFullConfig = {
   rootDir: "",
   quiet: false,
   shard: null,
+  tags: [],
   updateSnapshots: "missing",
   updateSourceMethod: "patch",
   version: "",

package/lib/isomorphic/testServerConnection.js

@@ -29,10 +29,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var testServerConnection_exports = {};
 __export(testServerConnection_exports, {
   TestServerConnection: () => TestServerConnection,
+  TestServerConnectionClosedError: () => TestServerConnectionClosedError,
   WebSocketTestServerTransport: () => WebSocketTestServerTransport
 });
 module.exports = __toCommonJS(testServerConnection_exports);
 var events = __toESM(require("./events"));
+class TestServerConnectionClosedError extends Error {
+  constructor() {
+    super("Test server connection closed");
+  }
+}
 class WebSocketTestServerTransport {
   constructor(url) {
     this._ws = new WebSocket(url);
@@ -63,6 +69,7 @@ class TestServerConnection {
     this._onStdioEmitter = new events.EventEmitter();
     this._onTestFilesChangedEmitter = new events.EventEmitter();
     this._onLoadTraceRequestedEmitter = new events.EventEmitter();
+    this._onTestPausedEmitter = new events.EventEmitter();
     this._lastId = 0;
     this._callbacks = /* @__PURE__ */ new Map();
     this._isClosed = false;
@@ -71,6 +78,7 @@ class TestServerConnection {
     this.onStdio = this._onStdioEmitter.event;
     this.onTestFilesChanged = this._onTestFilesChangedEmitter.event;
     this.onLoadTraceRequested = this._onLoadTraceRequestedEmitter.event;
+    this.onTestPaused = this._onTestPausedEmitter.event;
     this._transport = transport;
     this._transport.onmessage((data) => {
       const message = JSON.parse(data);
@@ -98,6 +106,9 @@ class TestServerConnection {
       this._isClosed = true;
       this._onCloseEmitter.fire();
       clearInterval(pingInterval);
+      for (const callback of this._callbacks.values())
+        callback.reject(new TestServerConnectionClosedError());
+      this._callbacks.clear();
     });
   }
   isClosed() {
@@ -127,6 +138,8 @@ class TestServerConnection {
       this._onTestFilesChangedEmitter.fire(params);
     else if (method === "loadTraceRequested")
       this._onLoadTraceRequestedEmitter.fire(params);
+    else if (method === "testPaused")
+      this._onTestPausedEmitter.fire(params);
   }
   async initialize(params) {
     await this._sendMessage("initialize", params);
@@ -207,5 +220,6 @@ class TestServerConnection {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   TestServerConnection,
+  TestServerConnectionClosedError,
   WebSocketTestServerTransport
 });

package/lib/loader/loaderMain.js

@@ -42,7 +42,7 @@ class LoaderMain extends import_process.ProcessRunner {
   async loadTestFile(params) {
     const testErrors = [];
     const config = await this._config();
-    const fileSuite = await (0, import_testLoader.loadTestFile)(params.file, config.config.rootDir, testErrors);
+    const fileSuite = await (0, import_testLoader.loadTestFile)(params.file, config, testErrors);
     this._poolBuilder.buildPools(fileSuite);
     return { fileSuite: fileSuite._deepSerialize(), testErrors };
   }

package/lib/matchers/expect.js

@@ -43,7 +43,7 @@ const printReceivedStringContainExpectedResult = (received, result) => result ==
   result[0].length
 );
 function createMatchers(actual, info, prefix) {
-  return new Proxy((0, import_expectBundle.expect)(actual), new ExpectMetaInfoProxyHandler(info, prefix));
+  return new Proxy((0, import_expectBundle.expect)(actual), new ExpectMetaInfoProxyHandler(actual, info, prefix));
 }
 const userMatchersSymbol = Symbol("userMatchers");
 function qualifiedMatcherName(qualifier, matcherName) {
@@ -185,11 +185,14 @@ const customMatchers = {
   toMatchSnapshot: import_toMatchSnapshot.toMatchSnapshot
 };
 class ExpectMetaInfoProxyHandler {
-  constructor(info, prefix) {
+  constructor(actual, info, prefix) {
+    this._actual = actual;
     this._info = { ...info };
     this._prefix = prefix;
   }
   get(target, matcherName, receiver) {
+    if (matcherName === "toThrowError")
+      matcherName = "toThrow";
     let matcher = Reflect.get(target, matcherName, receiver);
     if (typeof matcherName !== "string")
       return matcher;
@@ -220,15 +223,17 @@ class ExpectMetaInfoProxyHandler {
       if (!testInfo)
         return matcher.call(target, ...args);
       const customMessage = this._info.message || "";
-      const argsSuffix = computeArgsSuffix(matcherName, args);
-      const defaultTitle = `${this._info.poll ? "poll " : ""}${this._info.isSoft ? "soft " : ""}${this._info.isNot ? "not " : ""}${matcherName}${argsSuffix}`;
-      const title = customMessage || `Expect ${(0, import_utils.escapeWithQuotes)(defaultTitle, '"')}`;
-      const apiName = `expect${this._info.poll ? ".poll " : ""}${this._info.isSoft ? ".soft " : ""}${this._info.isNot ? ".not" : ""}.${matcherName}${argsSuffix}`;
+      const suffixes = (0, import_matchers.computeMatcherTitleSuffix)(matcherName, this._actual, args);
+      const defaultTitle = `${this._info.poll ? "poll " : ""}${this._info.isSoft ? "soft " : ""}${this._info.isNot ? "not " : ""}${matcherName}${suffixes.short || ""}`;
+      const shortTitle = customMessage || `Expect ${(0, import_utils.escapeWithQuotes)(defaultTitle, '"')}`;
+      const longTitle = shortTitle + (suffixes.long || "");
+      const apiName = `expect${this._info.poll ? ".poll " : ""}${this._info.isSoft ? ".soft " : ""}${this._info.isNot ? ".not" : ""}.${matcherName}${suffixes.short || ""}`;
       const stackFrames = (0, import_util.filteredStackTrace)((0, import_utils.captureRawStack)());
       const stepInfo = {
         category: "expect",
         apiName,
-        title,
+        title: longTitle,
+        shortTitle,
         params: args[0] ? { expected: args[0] } : void 0,
         infectParentStepsWithError: this._info.isSoft
       };
@@ -299,12 +304,6 @@ async function pollMatcher(qualifiedMatcherName2, info, prefix, ...args) {
     throw new Error(message);
   }
 }
-function computeArgsSuffix(matcherName, args) {
-  let value = "";
-  if (matcherName === "toHaveScreenshot")
-    value = (0, import_toMatchSnapshot.toHaveScreenshotStepTitle)(...args);
-  return value ? `(${value})` : "";
-}
 const expect = createExpect({}, [], {}).extend(customMatchers);
 function mergeExpects(...expects) {
   let merged = expect;

package/lib/matchers/matchers.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var matchers_exports = {};
 __export(matchers_exports, {
+  computeMatcherTitleSuffix: () => computeMatcherTitleSuffix,
   toBeAttached: () => toBeAttached,
   toBeChecked: () => toBeChecked,
   toBeDisabled: () => toBeDisabled,
@@ -56,6 +57,7 @@ var import_toBeTruthy = require("./toBeTruthy");
 var import_toEqual = require("./toEqual");
 var import_toHaveURL = require("./toHaveURL");
 var import_toMatchText = require("./toMatchText");
+var import_toMatchSnapshot = require("./toMatchSnapshot");
 var import_config = require("../common/config");
 var import_globals = require("../common/globals");
 var import_testInfo = require("../worker/testInfo");
@@ -332,8 +334,22 @@ async function toPass(callback, options = {}) {
   }
   return { pass: !this.isNot, message: () => "" };
 }
+function computeMatcherTitleSuffix(matcherName, receiver, args) {
+  if (matcherName === "toHaveScreenshot") {
+    const title = (0, import_toMatchSnapshot.toHaveScreenshotStepTitle)(...args);
+    return { short: title ? `(${title})` : "" };
+  }
+  if (receiver && typeof receiver === "object" && receiver.constructor?.name === "Locator") {
+    try {
+      return { long: " " + (0, import_utils.asLocatorDescription)("javascript", receiver._selector) };
+    } catch {
+    }
+  }
+  return {};
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  computeMatcherTitleSuffix,
   toBeAttached,
   toBeChecked,
   toBeDisabled,

package/lib/mcp/browser/browserServerBackend.js

@@ -33,7 +33,7 @@ class BrowserServerBackend {
     this._browserContextFactory = factory;
     this._tools = (0, import_tools.filteredTools)(config);
   }
-  async initialize(server, clientInfo) {
+  async initialize(clientInfo) {
     this._sessionLog = this._config.saveSession ? await import_sessionLog.SessionLog.create(this._config, clientInfo) : void 0;
     this._context = new import_context.Context({
       config: this._config,

package/lib/mcp/browser/config.js

@@ -38,8 +38,7 @@ __export(config_exports, {
   outputFile: () => outputFile,
   resolutionParser: () => resolutionParser,
   resolveCLIConfig: () => resolveCLIConfig,
-  resolveConfig: () => resolveConfig,
-  semicolonSeparatedList: () => semicolonSeparatedList
+  resolveConfig: () => resolveConfig
 });
 module.exports = __toCommonJS(config_exports);
 var import_fs = __toESM(require("fs"));
@@ -61,10 +60,6 @@ const defaultConfig = {
       viewport: null
     }
   },
-  network: {
-    allowedOrigins: void 0,
-    blockedOrigins: void 0
-  },
   server: {},
   saveTrace: false,
   timeouts: {
@@ -164,6 +159,7 @@ function configFromCLIOptions(cliOptions) {
       contextOptions,
       cdpEndpoint: cliOptions.cdpEndpoint,
       cdpHeaders: cliOptions.cdpHeader,
+      initPage: cliOptions.initPage,
       initScript: cliOptions.initScript
     },
     server: {
@@ -172,10 +168,6 @@ function configFromCLIOptions(cliOptions) {
       allowedHosts: cliOptions.allowedHosts
     },
     capabilities: cliOptions.caps,
-    network: {
-      allowedOrigins: cliOptions.allowedOrigins,
-      blockedOrigins: cliOptions.blockedOrigins
-    },
     saveSession: cliOptions.saveSession,
     saveTrace: cliOptions.saveTrace,
     saveVideo: cliOptions.saveVideo,
@@ -183,6 +175,7 @@ function configFromCLIOptions(cliOptions) {
     sharedBrowserContext: cliOptions.sharedBrowserContext,
     outputDir: cliOptions.outputDir,
     imageResponses: cliOptions.imageResponses,
+    testIdAttribute: cliOptions.testIdAttribute,
     timeouts: {
       action: cliOptions.timeoutAction,
       navigation: cliOptions.timeoutNavigation
@@ -193,8 +186,6 @@ 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);
   options.browser = envToString(process.env.PLAYWRIGHT_MCP_BROWSER);
   options.caps = commaSeparatedList(process.env.PLAYWRIGHT_MCP_CAPS);
@@ -207,6 +198,9 @@ function configFromEnv() {
   options.headless = envToBoolean(process.env.PLAYWRIGHT_MCP_HEADLESS);
   options.host = envToString(process.env.PLAYWRIGHT_MCP_HOST);
   options.ignoreHttpsErrors = envToBoolean(process.env.PLAYWRIGHT_MCP_IGNORE_HTTPS_ERRORS);
+  const initPage = envToString(process.env.PLAYWRIGHT_MCP_INIT_PAGE);
+  if (initPage)
+    options.initPage = [initPage];
   const initScript = envToString(process.env.PLAYWRIGHT_MCP_INIT_SCRIPT);
   if (initScript)
     options.initScript = [initScript];
@@ -222,6 +216,7 @@ function configFromEnv() {
   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.testIdAttribute = envToString(process.env.PLAYWRIGHT_MCP_TEST_ID_ATTRIBUTE);
   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);
@@ -258,7 +253,7 @@ async function resolveFile(config, clientInfo, fileName, options) {
     fileName = fileName.split("\\").join("/");
     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`);
+      throw new Error(`Resolved file path ${resolvedFile} is outside of the output directory ${dir}. Use relative file names to stay within the output directory.`);
     return resolvedFile;
   }
   return import_path.default.join(dir, sanitizeForFilePath(fileName));
@@ -290,10 +285,6 @@ function mergeConfig(base, overrides) {
     ...pickDefined(base),
     ...pickDefined(overrides),
     browser,
-    network: {
-      ...pickDefined(base.network),
-      ...pickDefined(overrides.network)
-    },
     server: {
       ...pickDefined(base.server),
       ...pickDefined(overrides.server)
@@ -304,11 +295,6 @@ function mergeConfig(base, overrides) {
     }
   };
 }
-function semicolonSeparatedList(value) {
-  if (!value)
-    return void 0;
-  return value.split(";").map((v) => v.trim());
-}
 function commaSeparatedList(value) {
   if (!value)
     return void 0;
@@ -378,6 +364,5 @@ function sanitizeForFilePath(s) {
   outputFile,
   resolutionParser,
   resolveCLIConfig,
-  resolveConfig,
-  semicolonSeparatedList
+  resolveConfig
 });

package/lib/mcp/browser/context.js

@@ -35,6 +35,7 @@ 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_playwright_core = require("playwright-core");
 var import_log = require("../log");
 var import_tab = require("./tab");
 var import_config = require("./config");
@@ -74,6 +75,7 @@ class Context {
     const { browserContext } = await this._ensureBrowserContext();
     const page = await browserContext.newPage();
     this._currentTab = this._tabs.find((t) => t.page === page);
+    await this._currentTab.initializedPromise;
     return this._currentTab;
   }
   async selectTab(index) {
@@ -167,17 +169,6 @@ class Context {
     await this.closeBrowserContext();
     Context._allContexts.delete(this);
   }
-  async _setupRequestInterception(context) {
-    if (this.config.network?.allowedOrigins?.length) {
-      await context.route("**", (route) => route.abort("blockedbyclient"));
-      for (const origin of this.config.network.allowedOrigins)
-        await context.route(originOrHostGlob(origin), (route) => route.continue());
-    }
-    if (this.config.network?.blockedOrigins?.length) {
-      for (const origin of this.config.network.blockedOrigins)
-        await context.route(originOrHostGlob(origin), (route) => route.abort("blockedbyclient"));
-    }
-  }
   async ensureBrowserContext() {
     const { browserContext } = await this._ensureBrowserContext();
     return browserContext;
@@ -194,9 +185,10 @@ class Context {
   async _setupBrowserContext() {
     if (this._closeBrowserContextPromise)
       throw new Error("Another browser context is being closed.");
+    if (this.config.testIdAttribute)
+      import_playwright_core.selectors.setTestIdAttribute(this.config.testIdAttribute);
     const result = await this._browserContextFactory.createContext(this._clientInfo, this._abortController.signal, this._runningToolName);
     const { browserContext } = result;
-    await this._setupRequestInterception(browserContext);
     if (this.sessionLog)
       await InputRecorder.create(this, browserContext);
     for (const page of browserContext.pages())
@@ -221,15 +213,6 @@ class Context {
     };
   }
 }
-function originOrHostGlob(originOrHost) {
-  try {
-    const url = new URL(originOrHost);
-    if (url.origin !== "null")
-      return `${url.origin}/**`;
-  } catch {
-  }
-  return `*://${originOrHost}/**`;
-}
 class InputRecorder {
   constructor(context, browserContext) {
     this._context = context;

package/lib/mcp/browser/response.js

@@ -31,7 +31,7 @@ class Response {
     this._result = [];
     this._code = [];
     this._images = [];
-    this._includeSnapshot = false;
+    this._includeSnapshot = "none";
     this._includeTabs = false;
     this._context = context;
     this.toolName = toolName;
@@ -62,14 +62,14 @@ class Response {
   images() {
     return this._images;
   }
-  setIncludeSnapshot() {
-    this._includeSnapshot = true;
+  setIncludeSnapshot(full) {
+    this._includeSnapshot = full ?? "incremental";
   }
   setIncludeTabs() {
     this._includeTabs = true;
   }
   async finish() {
-    if (this._includeSnapshot && this._context.currentTab())
+    if (this._includeSnapshot !== "none" && this._context.currentTab())
       this._tabSnapshot = await this._context.currentTabOrDie().captureSnapshot();
     for (const tab of this._context.tabs())
       await tab.updateTitle();
@@ -99,13 +99,14 @@ ${this._code.join("\n")}
 \`\`\``);
       response.push("");
     }
-    if (this._includeSnapshot || this._includeTabs)
+    if (this._includeSnapshot !== "none" || 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, options));
+      const includeSnapshot = options.omitSnapshot ? "none" : this._includeSnapshot;
+      response.push(renderTabSnapshot(this._tabSnapshot, includeSnapshot));
       response.push("");
     }
     const content = [
@@ -129,7 +130,7 @@ ${this._code.join("\n")}
     }
   }
 }
-function renderTabSnapshot(tabSnapshot, options = {}) {
+function renderTabSnapshot(tabSnapshot, includeSnapshot) {
   const lines = [];
   if (tabSnapshot.consoleMessages.length) {
     lines.push(`### New console messages`);
@@ -147,13 +148,21 @@ function renderTabSnapshot(tabSnapshot, options = {}) {
     }
     lines.push("");
   }
+  if (includeSnapshot === "incremental" && tabSnapshot.ariaSnapshotDiff === "") {
+    return lines.join("\n");
+  }
   lines.push(`### Page state`);
   lines.push(`- Page URL: ${tabSnapshot.url}`);
   lines.push(`- Page Title: ${tabSnapshot.title}`);
-  lines.push(`- Page Snapshot:`);
-  lines.push("```yaml");
-  lines.push(options.omitSnapshot ? "<snapshot>" : tabSnapshot.ariaSnapshot);
-  lines.push("```");
+  if (includeSnapshot !== "none") {
+    lines.push(`- Page Snapshot:`);
+    lines.push("```yaml");
+    if (includeSnapshot === "incremental" && tabSnapshot.ariaSnapshotDiff !== void 0)
+      lines.push(tabSnapshot.ariaSnapshotDiff);
+    else
+      lines.push(tabSnapshot.ariaSnapshot);
+    lines.push("```");
+  }
   return lines.join("\n");
 }
 function renderTabsMarkdown(tabs, force = false) {