@roxybrowser/playwright 2.0.2-beta.0 → 2.0.2-beta.10

package/dist/roxybrowser.bundle.js

@@ -5124,6 +5124,7 @@ var RoxyPage = class RoxyPage {
 	closed = false;
 	closePromise = null;
 	closeReason;
+	ownedContext;
 	defaultTimeoutMs = DEFAULT_EVENT_TIMEOUT_MS;
 	defaultNavigationTimeoutMs = DEFAULT_EVENT_TIMEOUT_MS;
 	currentViewportSize = null;
@@ -6111,6 +6112,10 @@ waiting for navigation${navigationTargetDescription} until "${waitUntil}"\n=====
 		}
 		this.closeReason = options.reason;
 		this.closePromise = (async () => {
+			if (this.ownedContext) {
+				await this.ownedContext.close().catch(() => {});
+				return;
+			}
 			await this.dismissActiveDialogsForClose();
 			await this.finalizeVideoRecording();
 			await this.adapter.close(options).catch(() => {});
@@ -6122,6 +6127,9 @@ waiting for navigation${navigationTargetDescription} until "${waitUntil}"\n=====
 			this.closePromise = null;
 		}
 	}
+	setOwnedContext(context) {
+		this.ownedContext = context;
+	}
 	defaultTimeout() {
 		return this.defaultTimeoutMs;
 	}
@@ -10650,12 +10658,74 @@ var RoxyBrowser = class {
 	session;
 	adapter;
 	humanDefaults;
-	browserName;
-	constructor(session, adapter, humanDefaults, browserName = "chromium") {
+	_browserName;
+	_browserType;
+	_version;
+	_contexts = [];
+	_listeners = /* @__PURE__ */ new Map();
+	_connected = true;
+	constructor(session, adapter, humanDefaults, _browserName, _browserType, _version) {
 		this.session = session;
 		this.adapter = adapter;
 		this.humanDefaults = humanDefaults;
-		this.browserName = browserName;
+		this._browserName = _browserName;
+		this._browserType = _browserType;
+		this._version = _version;
+	}
+	on(event, listener) {
+		return this._addListenerInternal(event, listener);
+	}
+	once(event, listener) {
+		const wrapped = (payload) => {
+			this._removeListenerInternal(event, listener);
+			listener(payload);
+		};
+		this._ensureListenerSet(event).add({
+			original: listener,
+			wrapped
+		});
+		return this;
+	}
+	addListener(event, listener) {
+		return this._addListenerInternal(event, listener);
+	}
+	removeListener(event, listener) {
+		return this._removeListenerInternal(event, listener);
+	}
+	off(event, listener) {
+		return this._removeListenerInternal(event, listener);
+	}
+	prependListener(event, listener) {
+		const entry = {
+			original: listener,
+			wrapped: listener
+		};
+		const existing = this._listeners.get(event);
+		if (!existing) {
+			const s = new Set([entry]);
+			this._listeners.set(event, s);
+		} else {
+			const s = new Set([entry, ...Array.from(existing)]);
+			this._listeners.set(event, s);
+		}
+		return this;
+	}
+	removeAllListeners(type) {
+		if (type === void 0) this._listeners.clear();
+		else this._listeners.delete(type);
+		return this;
+	}
+	browserType() {
+		return this._browserType;
+	}
+	contexts() {
+		return [...this._contexts];
+	}
+	isConnected() {
+		return this._connected;
+	}
+	version() {
+		return this._version;
 	}
 	async newContext(options = {}) {
 		const normalizedOptions = {
@@ -10666,26 +10736,66 @@ var RoxyBrowser = class {
 				...options.recordVideo.dir ? { dir: resolve(options.recordVideo.dir) } : {}
 			} } : {}
 		};
-		return new RoxyBrowserContext(await this.session.newContext(normalizedOptions), resolveHumanizationOptions(normalizedOptions.human, this.humanDefaults), normalizedOptions, this.browserName);
-	}
-	async version() {
-		return this.session.version();
+		const context = new RoxyBrowserContext(await this.session.newContext(normalizedOptions), resolveHumanizationOptions(normalizedOptions.human, this.humanDefaults), normalizedOptions, this._browserName);
+		this._contexts.push(context);
+		context.on("close", () => {
+			const index = this._contexts.indexOf(context);
+			if (index !== -1) this._contexts.splice(index, 1);
+		});
+		this._emit("context", context);
+		return context;
+	}
+	async newPage(options) {
+		const context = await this.newContext(options);
+		const page = await context.newPage();
+		const roxyPage = page;
+		if (typeof roxyPage.setOwnedContext === "function") roxyPage.setOwnedContext(context);
+		else page.once("close", () => context.close().catch(() => {}));
+		return page;
 	}
-	async close() {
+	async close(options) {
+		if (!this._connected) return;
+		this._connected = false;
 		try {
 			await withCloseTimeout$1(this.session.close(), BROWSER_SESSION_CLOSE_TIMEOUT_MS);
 		} finally {
 			await this.adapter.close();
+			this._emit("disconnected", this);
 		}
 	}
+	_addListenerInternal(event, listener) {
+		this._ensureListenerSet(event).add({
+			original: listener,
+			wrapped: listener
+		});
+		return this;
+	}
+	_removeListenerInternal(event, listener) {
+		const entries = this._listeners.get(event);
+		if (!entries) return this;
+		for (const entry of Array.from(entries)) if (entry.original === listener) entries.delete(entry);
+		if (entries.size === 0) this._listeners.delete(event);
+		return this;
+	}
+	_ensureListenerSet(event) {
+		const existing = this._listeners.get(event);
+		if (existing) return existing;
+		const created = /* @__PURE__ */ new Set();
+		this._listeners.set(event, created);
+		return created;
+	}
+	_emit(event, payload) {
+		const entries = this._listeners.get(event);
+		if (!entries?.size) return false;
+		for (const entry of Array.from(entries)) entry.wrapped(payload);
+		return true;
+	}
 };
 async function withCloseTimeout$1(promise, timeoutMs) {
 	let timer;
 	try {
 		return await Promise.race([promise, new Promise((_, reject) => {
-			timer = setTimeout(() => {
-				reject(/* @__PURE__ */ new Error(`Timed out closing browser session after ${timeoutMs}ms.`));
-			}, timeoutMs);
+			timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Timed out closing browser session after ${timeoutMs}ms.`)), timeoutMs);
 		})]);
 	} finally {
 		if (timer) clearTimeout(timer);
@@ -14532,8 +14642,10 @@ var WebSocketBidiClient = class {
 	eventListeners = /* @__PURE__ */ new Map();
 	pendingCommands = /* @__PURE__ */ new Map();
 	socket;
+	webSocketUrl;
 	constructor(options) {
 		this.capabilities = { browserName: options.browserName };
+		this.webSocketUrl = options.webSocketUrl;
 		this.socket = new globalThis.WebSocket(options.webSocketUrl);
 		this.socket.addEventListener("message", (event) => this.handleMessage(event.data));
 		this.socket.addEventListener("close", () => this.handleClose());
@@ -14543,7 +14655,7 @@ var WebSocketBidiClient = class {
 		return new Promise((resolve, reject) => {
 			this.socket.addEventListener("open", resolve, { once: true });
 			this.socket.addEventListener("error", (event) => {
-				reject(/* @__PURE__ */ new Error(`Failed to establish a WebDriver BiDi connection: ${String(event)}`));
+				reject(new Error(formatBidiConnectError(event, this.webSocketUrl)));
 			}, { once: true });
 		});
 	}
@@ -14714,6 +14826,28 @@ var WebSocketBidiClient = class {
 		this.pendingCommands.clear();
 	}
 };
+function formatBidiConnectError(event, webSocketUrl) {
+	const details = extractBidiConnectErrorDetails(event);
+	return details ? `Failed to establish a WebDriver BiDi connection to ${webSocketUrl}: ${details}` : `Failed to establish a WebDriver BiDi connection to ${webSocketUrl}.`;
+}
+function extractBidiConnectErrorDetails(event) {
+	if (event instanceof Error) return event.message;
+	if (!event || typeof event !== "object") return typeof event === "string" ? event : void 0;
+	const candidate = event;
+	const parts = [];
+	if (typeof candidate.message === "string" && candidate.message) parts.push(candidate.message);
+	if (typeof candidate.error === "string" && candidate.error) parts.push(candidate.error);
+	else if (candidate.error instanceof Error && candidate.error.message) parts.push(candidate.error.message);
+	const socketLike = candidate.target ?? candidate.currentTarget;
+	if (socketLike && typeof socketLike === "object") {
+		const socketParts = [];
+		if (typeof socketLike.url === "string" && socketLike.url) socketParts.push(`url=${socketLike.url}`);
+		if (typeof socketLike.readyState === "number") socketParts.push(`readyState=${socketLike.readyState}`);
+		if (socketParts.length > 0) parts.push(`socket(${socketParts.join(", ")})`);
+	}
+	if (parts.length > 0) return parts.join("; ");
+	if (typeof candidate.type === "string" && candidate.type) return `event type=${candidate.type}`;
+}
 var bidiClientFactory = createBidiClient;
 function getBidiClientFactory() {
 	return bidiClientFactory;
@@ -15981,7 +16115,7 @@ var BidiPageAdapter = class BidiPageAdapter {
 			resultOwnership: "none"
 		}));
 		if (response.type === "exception") throw new Error(response.exceptionDetails.text || "BiDi evaluation failed.");
-		return parseSerializedEvaluationResult(extractBiDiValue(response.result));
+		return parseSerializedEvaluationResult(extractBiDiValue$1(response.result));
 	}
 	async evaluateFunction(expression, arg) {
 		const serializedArg = arg === void 0 ? "" : serializeForEvaluation$1(arg);
@@ -17225,11 +17359,11 @@ var BidiElementHandleAdapter = class BidiElementHandleAdapter {
 		return this.page.selectOptionReference(this.reference(), values, options);
 	}
 };
-function extractBiDiValue(value) {
-	if (value.type === "array" && Array.isArray(value.value)) return value.value.map((entry) => extractBiDiValue(entry));
+function extractBiDiValue$1(value) {
+	if (value.type === "array" && Array.isArray(value.value)) return value.value.map((entry) => extractBiDiValue$1(entry));
 	if (value.type === "object" && Array.isArray(value.value)) {
 		const obj = {};
-		for (const [key, val] of value.value) obj[key] = extractBiDiValue(val);
+		for (const [key, val] of value.value) obj[key] = extractBiDiValue$1(val);
 		return obj;
 	}
 	return value.value;
@@ -17590,13 +17724,13 @@ function buildFirefoxBidiEndpoint(wsEndpoint, sessionId) {
 	if (url.pathname === "/" || url.pathname === "") url.pathname = "/session";
 	return url.toString();
 }
-function isSessionSpecificFirefoxBidiEndpoint(wsEndpoint) {
+function isSessionSpecificFirefoxBidiEndpoint$1(wsEndpoint) {
 	const pathname = new URL(wsEndpoint).pathname;
 	return /^\/session\/[^/]+$/.test(pathname);
 }
 async function ensureBiDiSession(client, sessionId, wsEndpoint) {
 	await client.sessionStatus({});
-	if (sessionId || isSessionSpecificFirefoxBidiEndpoint(wsEndpoint)) return false;
+	if (sessionId || isSessionSpecificFirefoxBidiEndpoint$1(wsEndpoint)) return false;
 	try {
 		await client.browsingContextGetTree({});
 		return false;
@@ -17621,9 +17755,9 @@ function buildFirefoxLaunchArgs(options, userDataDir, port) {
 		...options.args ?? []
 	];
 }
-function resolveFirefoxExecutableCandidates(options, platform = currentPlatform$1(), fileExistsFn = fileExists$1) {
+function resolveFirefoxExecutableCandidates(options, platform = currentPlatform$1(), playwrightFirefoxExecutablePath, fileExistsFn = fileExists$1) {
 	if (options.executablePath) return [options.executablePath];
-	return filterExistingFirefoxExecutableCandidates(defaultFirefoxExecutableCandidates(platform), platform, fileExistsFn);
+	return filterExistingFirefoxExecutableCandidates([...playwrightFirefoxExecutablePath ? [playwrightFirefoxExecutablePath] : [], ...defaultFirefoxExecutableCandidates(platform)], platform, fileExistsFn);
 }
 function defaultFirefoxExecutableCandidates(platform) {
 	const candidates = [];
@@ -53274,11 +53408,34 @@ var RoxyBrowserType = class {
 			protocol: options.protocol ?? (this.browserName === "firefox" ? "bidi" : "cdp")
 		});
 	}
-	async connect(options) {
+	/**
+	* Connect to an already-running browser over a WebSocket endpoint.
+	*
+	* ⚠️ DIVERGENCE FROM PLAYWRIGHT — DO NOT "FIX" THIS BACK TO CDP-ONLY:
+	*
+	* In upstream Playwright, `BrowserType.connect()` is a CDP-only operation: it
+	* connects to a running Chromium over the DevTools Protocol. Firefox/WebKit are
+	* not supported here (Playwright routes BiDi through `connectOverCDP`-style
+	* helpers or its own internal plumbing, not this method).
+	*
+	* Roxy intentionally changes that semantics. This method dispatches on
+	* `browserName` so a single entry point serves both browser families:
+	*   - chromium  → CDP  (ws:// DevTools endpoint)
+	*   - firefox   → BiDi (ws:// WebDriver BiDi endpoint)
+	*
+	* This is deliberate, not a bug. If you are an agent "normalizing" this code to
+	* match Playwright upstream, STOP — the dual-protocol dispatch is the feature.
+	* To force CDP specifically, call `connectOverCDP()` instead, which remains
+	* chromium-only and CDP-only by design (see the guard below).
+	*
+	* `options.protocol` may still be passed to override the per-browser default.
+	*/
+	async connect(endpointURL, options) {
 		return this.connectBrowser({
-			...options,
-			browserName: options.browserName ?? this.browserName,
-			protocol: options.protocol ?? (this.browserName === "firefox" ? "bidi" : "cdp")
+			browserName: this.browserName,
+			protocol: this.browserName === "chromium" ? "cdp" : "bidi",
+			wsEndpoint: endpointURL,
+			...options
 		});
 	}
 	async connectOverCDP(progressOrEndpointURL, endpointURLOrOptions, maybeOptions = {}) {
@@ -53310,7 +53467,9 @@ var RoxyBrowserType = class {
 			protocol
 		});
 		await adapter.connect();
-		return new RoxyBrowser(await adapter.browser(), adapter, resolveHumanizationOptions(options.human), options.browserName ?? this.browserName);
+		const session = await adapter.browser();
+		const versionStr = await session.version();
+		return new RoxyBrowser(session, adapter, resolveHumanizationOptions(options.human), options.browserName ?? this.browserName, this, versionStr);
 	}
 };
 var chromium = new RoxyBrowserType("chromium", {
@@ -73280,11 +73439,6 @@ function formatConnectResult(input) {
 	if (input.snapshot) parts.push(formatSnapshot(input.snapshot));
 	return parts.join("\n\n");
 }
-function formatTabsWithOptionalSnapshot(tabs, snapshot) {
-	const parts = [formatTabs(tabs)];
-	if (snapshot) parts.push(formatSnapshot(snapshot));
-	return parts.join("\n\n");
-}
 //#endregion
 //#region src/mcp/backend/response.ts
 var Response$1 = class {
@@ -73294,9 +73448,11 @@ var Response$1 = class {
 	results = [];
 	errors = [];
 	code = [];
+	images = [];
 	includeSnapshot = "none";
 	fullSnapshot;
 	isClose = false;
+	rawResults = false;
 	constructor(context, toolName, toolArgs) {
 		this.context = context;
 		this.toolName = toolName;
@@ -73311,9 +73467,18 @@ var Response$1 = class {
 	addCode(code) {
 		this.code.push(code);
 	}
+	addImageResult(data, mimeType) {
+		this.images.push({
+			data,
+			mimeType
+		});
+	}
 	setClose() {
 		this.isClose = true;
 	}
+	setRawResults() {
+		this.rawResults = true;
+	}
 	setIncludeSnapshot() {
 		this.includeSnapshot = this.context.config.snapshot?.mode ?? "full";
 	}
@@ -73329,6 +73494,21 @@ var Response$1 = class {
 	async serialize() {
 		const sections = [];
 		if (this.errors.length) sections.push("### Error", ...this.errors);
+		if (this.rawResults) {
+			if (this.results.length) sections.push(...this.results);
+			return {
+				content: [{
+					type: "text",
+					text: sections.join("\n")
+				}, ...this.images.map((image) => ({
+					type: "image",
+					data: image.data,
+					mimeType: image.mimeType
+				}))],
+				...this.isClose ? { isClose: true } : {},
+				...this.errors.length ? { isError: true } : {}
+			};
+		}
 		if (this.results.length) {
 			if (sections.length) sections.push("");
 			sections.push("### Result", ...this.results);
@@ -73338,16 +73518,23 @@ var Response$1 = class {
 			sections.push("### Code", "```js", ...this.code, "```");
 		}
 		if (this.includeSnapshot === "full") {
-			const snapshot = await this.context.runtime.snapshot();
-			if (sections.length) sections.push("");
-			sections.push(formatSnapshot(snapshot));
+			if (!await this.context.runtime.hasDialog()) {
+				const snapshot = await reconcileSnapshotWithTabs(this.context, await this.context.runtime.snapshot());
+				if (sections.length) sections.push("");
+				sections.push(formatSnapshot(snapshot));
+			}
 		}
 		if (this.fullSnapshot) {
-			const snapshot = await this.context.runtime.snapshot({
+			let snapshot = await reconcileSnapshotWithTabs(this.context, await this.context.runtime.snapshot({
 				...this.fullSnapshot.target !== void 0 ? { target: this.fullSnapshot.target } : {},
 				...this.fullSnapshot.depth !== void 0 ? { depth: this.fullSnapshot.depth } : {},
 				...this.fullSnapshot.boxes !== void 0 ? { boxes: this.fullSnapshot.boxes } : {}
-			});
+			}));
+			if (!this.fullSnapshot.filename && snapshot.retryable && snapshot.text.trim().length === 0 && snapshot.url && snapshot.url !== "about:blank") snapshot = await reconcileSnapshotWithTabs(this.context, await this.context.runtime.snapshot({
+				...this.fullSnapshot.target !== void 0 ? { target: this.fullSnapshot.target } : {},
+				...this.fullSnapshot.depth !== void 0 ? { depth: this.fullSnapshot.depth } : {},
+				...this.fullSnapshot.boxes !== void 0 ? { boxes: this.fullSnapshot.boxes } : {}
+			}));
 			if (this.fullSnapshot.filename) {
 				const resolvedFilename = await this.context.resolveOutputFile(this.fullSnapshot.filename);
 				await writeFile(resolvedFilename, snapshot.text);
@@ -73364,17 +73551,30 @@ var Response$1 = class {
 			content: [{
 				type: "text",
 				text: sections.join("\n")
-			}],
+			}, ...this.images.map((image) => ({
+				type: "image",
+				data: image.data,
+				mimeType: image.mimeType
+			}))],
 			...this.isClose ? { isClose: true } : {},
 			...this.errors.length ? { isError: true } : {}
 		};
 	}
 };
-//#endregion
-//#region src/mcp/backend/common.ts
-var common_default$1 = [];
+async function reconcileSnapshotWithTabs(context, snapshot) {
+	const activeTab = (await context.runtime.listTabs()).find((tab) => tab.active);
+	if (!activeTab) return snapshot;
+	return {
+		...snapshot,
+		title: activeTab.title || snapshot.title,
+		url: activeTab.url || snapshot.url
+	};
+}
 //#endregion
 //#region src/mcp/backend/tool.ts
+function defineTool$1(tool) {
+	return tool;
+}
 function defineTabTool(tool) {
 	return {
 		...tool,
@@ -73391,6 +73591,146 @@ function missingModalStateMessage(tool) {
 	if (tool.clearsModalState === "fileChooser") return "[no_file_chooser] No file chooser visible.";
 	return `Error: The tool "${tool.schema.name}" can only be used when there is related modal state present.`;
 }
+var common_default = [defineTool$1({
+	capability: "core-tabs",
+	schema: {
+		name: "browser_close",
+		title: "Close browser",
+		description: "Close the current browser session.",
+		inputSchema: object({}),
+		type: "action"
+	},
+	handle: async (context, _params, response) => {
+		await context.runtime.close();
+		response.setClose();
+		response.addTextResult("Browser session closed.");
+	}
+}), defineTool$1({
+	capability: "core",
+	schema: {
+		name: "browser_resize",
+		title: "Resize browser",
+		description: "Resize the active page viewport.",
+		inputSchema: object({
+			width: number().int().positive(),
+			height: number().int().positive()
+		}),
+		type: "action"
+	},
+	handle: async (context, params, response) => {
+		const snapshot = await context.runtime.resize(params.width, params.height);
+		response.setIncludeSnapshot();
+		response.addCode(`await page.setViewportSize({ width: ${params.width}, height: ${params.height} });`);
+		if (!snapshot) response.addTextResult(`Resized viewport to ${params.width}x${params.height}.`);
+	}
+})];
+var console_default = [defineTool$1({
+	capability: "core",
+	schema: {
+		name: "browser_console_messages",
+		title: "Get console messages",
+		description: "Returns all console messages",
+		inputSchema: object({
+			level: _enum([
+				"error",
+				"warning",
+				"info",
+				"debug"
+			]).default("info").describe("Level of the console messages to return. Each level includes the messages of more severe levels. Defaults to \"info\"."),
+			all: boolean().optional().describe("Return all console messages since the beginning of the session, not just since the last navigation. Defaults to false."),
+			filename: string().optional().describe("Filename to save the console messages to. If not provided, messages are returned as text.")
+		}),
+		type: "readOnly"
+	},
+	handle: async (context, params, response) => {
+		const messages = await context.runtime.consoleMessages(params.level, params.all);
+		const errors = messages.filter((message) => message.type === "error" || message.type === "assert").length;
+		const warnings = messages.filter((message) => message.type === "warning").length;
+		const text = [
+			`Total messages: ${messages.length} (Errors: ${errors}, Warnings: ${warnings})`,
+			"",
+			...messages.map((message) => message.formattedText)
+		].join("\n");
+		if (params.filename) {
+			const resolvedFilename = await context.resolveOutputFile(params.filename);
+			await writeFile(resolvedFilename, text);
+			response.addTextResult(`Saved console messages to "${resolvedFilename}".`);
+			return;
+		}
+		response.addTextResult(text);
+	}
+})];
+var connect_default = [defineTool$1({
+	capability: "config",
+	schema: {
+		name: "roxy_browser_connect",
+		title: "Roxy Browser Connect",
+		description: "Attach to an existing browser and seed the active tab snapshot.",
+		inputSchema: object({
+			endpoint: string().min(1),
+			browser: _enum(["chrome", "firefox"]).default("chrome"),
+			sessionId: string().min(1).optional()
+		}),
+		type: "action"
+	},
+	handle: async (context, params, response) => {
+		const protocol = params.browser === "firefox" ? "bidi" : "cdp";
+		const result = await context.runtime.connect({
+			protocol,
+			endpoint: params.endpoint,
+			browser: params.browser === "chrome" ? "chromium" : params.browser,
+			...params.sessionId ? { sessionId: params.sessionId } : {}
+		});
+		response.addTextResult(formatConnectResult({
+			...result,
+			browserName: result.browserName === "chromium" ? "chrome" : result.browserName
+		}));
+	}
+})];
+var dialogs_default = [defineTool$1({
+	capability: "core",
+	schema: {
+		name: "browser_handle_dialog",
+		title: "Handle a dialog",
+		description: "Handle a dialog",
+		inputSchema: object({
+			accept: boolean().describe("Whether to accept the dialog."),
+			promptText: string().optional().describe("The text of the prompt in case of a prompt dialog.")
+		}),
+		type: "action"
+	},
+	handle: async (context, params, response) => {
+		const snapshot = await context.runtime.handleDialog(params.accept, params.promptText);
+		response.setIncludeSnapshot();
+		if (!snapshot) response.addTextResult(params.accept ? "Accepted dialog." : "Dismissed dialog.");
+	}
+})];
+var evaluate_default = [defineTool$1({
+	capability: "core",
+	schema: {
+		name: "browser_evaluate",
+		title: "Evaluate JavaScript",
+		description: "Evaluate JavaScript expression on page or element",
+		inputSchema: object({
+			element: string().optional().describe("Human-readable element description used to obtain permission to interact with the element"),
+			target: string().optional().describe("Exact target element reference from the page snapshot, or a unique element selector"),
+			function: string().describe("() => { /* code */ } or (element) => { /* code */ } when element is provided"),
+			filename: string().optional().describe("Filename to save the result to. If not provided, result is returned as text.")
+		}),
+		type: "action"
+	},
+	handle: async (context, params, response) => {
+		const result = await context.runtime.evaluate(params.function, params.target);
+		const text = JSON.stringify(result, null, 2) ?? "undefined";
+		if (params.filename) {
+			const resolvedFilename = await context.resolveOutputFile(params.filename);
+			await writeFile(resolvedFilename, text);
+			response.addTextResult(`Saved evaluation result to "${resolvedFilename}".`);
+			return;
+		}
+		response.addTextResult(text);
+	}
+})];
 var files_default = [defineTabTool({
 	capability: "core",
 	schema: {
@@ -73602,7 +73942,7 @@ var typeSchema = elementSchema$2.extend({
 	submit: boolean().optional().describe("Whether to submit entered text (press Enter after)"),
 	slowly: boolean().optional().describe("Whether to type one character at a time. Useful for triggering key handlers in the page. By default entire text is filled in at once.")
 });
-var keyboard_default$1 = [defineTabTool({
+var keyboard_default = [defineTabTool({
 	capability: "core-input",
 	schema: {
 		name: "browser_press_key",
@@ -73648,150 +73988,55 @@ var keyboard_default$1 = [defineTabTool({
 		});
 	}
 })];
-//#endregion
-//#region src/mcp/backend/tools.ts
-var browserTools = [
-	...common_default$1,
-	...files_default,
-	...keyboard_default$1,
-	...snapshot_default
-];
-//#endregion
-//#region src/mcp/errors.ts
-var McpToolError = class extends Error {
-	code;
-	constructor(code, message) {
-		super(message);
-		this.code = code;
-		this.name = "McpToolError";
-	}
-};
-function isMcpToolError(error) {
-	return error instanceof McpToolError;
-}
-//#endregion
-//#region src/mcp/tool.ts
-function defineTool(tool) {
-	return tool;
-}
-function textResult(text, isError = false) {
-	return {
-		content: [{
-			type: "text",
-			text
-		}],
-		...isError ? { isError: true } : {}
-	};
-}
-var connect_default = [defineTool({
-	schema: {
-		name: "roxy_browser_connect",
-		title: "Roxy Browser Connect",
-		description: "Attach to an existing browser over CDP or BiDi and seed the active tab snapshot.",
-		inputSchema: object({
-			protocol: _enum(["cdp", "bidi"]),
-			endpoint: string().min(1),
-			browser: _enum(["chromium", "firefox"]).optional()
-		})
-	},
-	handle: async (args, runtime) => {
-		return textResult(formatConnectResult(await runtime.connect({
-			protocol: args.protocol,
-			endpoint: args.endpoint,
-			...args.browser ? { browser: args.browser } : {}
-		})));
-	}
-})];
-var common_default = [defineTool({
-	schema: {
-		name: "browser_close",
-		title: "Close browser",
-		description: "Close the page",
-		inputSchema: object({})
-	},
-	handle: async (_args, runtime) => {
-		await runtime.close();
-		return textResult(formatTabs([]));
-	}
-}), defineTool({
-	schema: {
-		name: "browser_resize",
-		title: "Resize browser window",
-		description: "Resize the browser window",
-		inputSchema: object({
-			width: number().describe("Width of the browser window"),
-			height: number().describe("Height of the browser window")
-		})
-	},
-	handle: async (args, runtime) => {
-		const snap = await runtime.resize(args.width, args.height);
-		if (!snap) return textResult(`Resized browser window to ${args.width}x${args.height}.`);
-		return textResult(formatSnapshot(snap));
-	}
-})];
-var tabs_default = [defineTool({
-	schema: {
-		name: "browser_tabs",
-		title: "Browser Tabs",
-		description: "List, create, select, and close browser tabs for the current MCP browser session.",
-		inputSchema: object({
-			action: _enum([
-				"list",
-				"new",
-				"select",
-				"close"
-			]),
-			index: number().int().nonnegative().optional(),
-			url: string().url().optional()
-		})
-	},
-	handle: async (args, runtime) => {
-		if (args.action === "list") return textResult(formatTabs(await runtime.listTabs()));
-		if (args.action === "new") {
-			const result = await runtime.newTab(args.url);
-			return textResult(formatTabsWithOptionalSnapshot(result.tabs, result.snapshot));
+var navigate_default = [
+	defineTool$1({
+		capability: "core-navigation",
+		schema: {
+			name: "browser_navigate",
+			title: "Navigate to a URL",
+			description: "Navigate to a URL",
+			inputSchema: object({ url: string().describe("The URL to navigate to") }),
+			type: "action"
+		},
+		handle: async (context, params, response) => {
+			await context.ensureTab();
+			await context.runtime.navigate(params.url);
+			response.setIncludeSnapshot();
+			response.addCode(`await page.goto('${params.url.startsWith("http") ? params.url : params.url.startsWith("localhost") ? `http://${params.url}` : `https://${params.url}`}');`);
 		}
-		if (args.action === "select") {
-			const result = await runtime.selectTab(args.index);
-			return textResult(formatTabsWithOptionalSnapshot(result.tabs, result.snapshot));
+	}),
+	defineTool$1({
+		capability: "core-navigation",
+		schema: {
+			name: "browser_navigate_back",
+			title: "Go back",
+			description: "Go back to the previous page in the history",
+			inputSchema: object({}),
+			type: "action"
+		},
+		handle: async (context, _params, response) => {
+			await context.runtime.goBack();
+			response.setIncludeSnapshot();
+			response.addCode("await page.goBack();");
 		}
-		const result = await runtime.closeTab(args.index);
-		return textResult(formatTabsWithOptionalSnapshot(result.tabs, result.snapshot));
-	}
-})];
-//#endregion
-//#region src/mcp/tools/navigate.ts
-var navigate = defineTool({
-	schema: {
-		name: "browser_navigate",
-		title: "Navigate to a URL",
-		description: "Navigate to a URL",
-		inputSchema: object({ url: string().describe("The URL to navigate to") })
-	},
-	handle: async (args, runtime) => {
-		const snap = await runtime.navigate(args.url);
-		if (!snap) return textResult(`Navigated to "${args.url}".`);
-		return textResult(formatSnapshot(snap));
-	}
-});
-var goBack = defineTool({
-	schema: {
-		name: "browser_navigate_back",
-		title: "Go back",
-		description: "Go back to the previous page in the history",
-		inputSchema: object({})
-	},
-	handle: async (_args, runtime) => {
-		const snap = await runtime.goBack();
-		if (!snap) return textResult("Navigated back.");
-		return textResult(formatSnapshot(snap));
-	}
-});
-object({});
-var navigate_default = [
-	navigate,
-	goBack,
-	defineTool({
+	}),
+	defineTool$1({
+		capability: "core-navigation",
+		schema: {
+			name: "browser_navigate_forward",
+			title: "Go forward",
+			description: "Go forward to the next page in the history",
+			inputSchema: object({}),
+			type: "action"
+		},
+		handle: async (context, _params, response) => {
+			await context.runtime.goForward();
+			response.setIncludeSnapshot();
+			response.addCode("await page.goForward();");
+		}
+	}),
+	defineTool$1({
+		capability: "core-navigation",
 		schema: {
 			name: "browser_wait_for",
 			title: "Wait for",
@@ -73800,228 +74045,31 @@ var navigate_default = [
 				time: number().optional().describe("The time to wait in seconds"),
 				text: string().optional().describe("The text to wait for"),
 				textGone: string().optional().describe("The text to wait for to disappear")
-			})
+			}),
+			type: "action"
 		},
-		handle: async (args, runtime) => {
-			if (!args.text && !args.textGone && !args.time) throw new Error("Either time, text or textGone must be provided");
-			if (args.time) await new Promise((resolve) => setTimeout(resolve, Math.min(3e4, args.time * 1e3)));
-			return textResult(formatSnapshot(await runtime.waitFor({
-				...args.text !== void 0 ? { text: args.text } : {},
-				...args.textGone !== void 0 ? { textGone: args.textGone } : {}
-			}, 5e3)));
+		handle: async (context, params, response) => {
+			if (!params.text && !params.textGone && !params.time) throw new Error("Either time, text or textGone must be provided");
+			const waitSeconds = params.time;
+			if (waitSeconds !== void 0) await new Promise((resolve) => setTimeout(resolve, Math.min(3e4, waitSeconds * 1e3)));
+			if (params.text || params.textGone) await context.runtime.waitFor({
+				...params.text !== void 0 ? { text: params.text } : {},
+				...params.textGone !== void 0 ? { textGone: params.textGone } : {}
+			}, 5e3);
+			response.setIncludeSnapshot();
 		}
 	})
 ];
-object({
-	element: string().optional().describe("Human-readable element description used to obtain permission to interact with the element"),
-	target: string().describe("Exact target element reference from the page snapshot, or a unique element selector")
-}).extend({
-	doubleClick: boolean().optional().describe("Whether to perform a double click instead of a single click"),
-	button: _enum([
-		"left",
-		"right",
-		"middle"
-	]).optional().describe("Button to click, defaults to left"),
-	modifiers: array(_enum([
-		"Alt",
-		"Control",
-		"ControlOrMeta",
-		"Meta",
-		"Shift"
-	])).optional().describe("Modifier keys to press during the click"),
-	human: object({ profile: _enum([
-		"cautious",
-		"balanced",
-		"fast"
-	]).optional().describe("Humanization timing profile, defaults to balanced") }).optional().describe("Humanization settings for this click")
-});
-object({
-	startElement: string().optional().describe("Human-readable source element description used to obtain the permission to interact with the element"),
-	startTarget: string().describe("Exact target element reference from the page snapshot, or a unique element selector"),
-	endElement: string().optional().describe("Human-readable target element description used to obtain the permission to interact with the element"),
-	endTarget: string().describe("Exact target element reference from the page snapshot, or a unique element selector")
-});
-object({
-	element: string().optional().describe("Human-readable element description used to obtain permission"),
-	ref: string().optional().describe("Element to scroll; omit to scroll the whole page"),
-	deltaX: number().optional().describe("Horizontal scroll delta in pixels (default 0)"),
-	deltaY: number().optional().describe("Vertical scroll delta in pixels (default 0)")
-});
-var mouse_default = [];
 //#endregion
-//#region src/mcp/tools/keyboard.ts
-object({
-	element: string().optional().describe("Human-readable element description used to obtain permission"),
-	target: string().describe("Exact target element reference from the page snapshot, or a unique element selector"),
-	text: string().describe("Text to type into the element"),
-	submit: boolean().optional().describe("Whether to submit entered text (press Enter after)"),
-	slowly: boolean().optional().describe("Whether to type one character at a time. Useful for triggering key handlers in the page. By default entire text is filled in at once.")
-});
-object({ key: string().describe("Key to press, e.g. Enter, Escape, Tab, ArrowLeft, Backspace, Delete, or printable characters") });
-var keyboard_default = [];
-object({
-	element: string().optional().describe("Human-readable element description used to obtain permission"),
-	target: string().describe("Exact target element reference from the page snapshot, or a unique element selector")
-}).extend({ values: array(string()).describe("Option values or visible labels to select") });
-object({ paths: array(string()).optional().describe("The absolute paths to the files to upload. Can be single file or multiple files. If omitted, file chooser is cancelled.") });
-var form_default = [defineTool({
-	schema: {
-		name: "browser_fill_form",
-		title: "Fill form",
-		description: "Fill multiple form fields",
-		inputSchema: object({ fields: array(object({
-			name: string().describe("Human-readable field name"),
-			type: _enum([
-				"textbox",
-				"checkbox",
-				"radio",
-				"combobox",
-				"slider"
-			]).describe("Type of the field"),
-			target: string().describe("Exact target element reference from the page snapshot, or a unique element selector"),
-			value: string().describe("Value to fill in the field. If the field is a checkbox, the value should be `true` or `false`. If the field is a combobox, the value should be the text of the option.")
-		})).describe("Fields to fill in") })
-	},
-	handle: async (args, runtime) => {
-		const snap = await runtime.fillForm(args.fields);
-		if (!snap) return textResult("Filled form.");
-		return textResult(formatSnapshot(snap));
-	}
-}), defineTool({
-	schema: {
-		name: "browser_drop",
-		title: "Drop files or data onto an element",
-		description: "Drop files or MIME-typed data onto an element, as if dragged from outside the page. At least one of paths or data must be provided.",
-		inputSchema: object({
-			element: string().optional().describe("Human-readable element description used to obtain permission to interact with the element"),
-			target: string().describe("Exact target element reference from the page snapshot, or a unique element selector"),
-			paths: array(string()).optional().describe("Absolute paths to files to drop onto the element."),
-			data: record(string(), string()).optional().describe("Data to drop, as a map of MIME type to string value.")
-		})
-	},
-	handle: async (args, runtime) => {
-		if (!args.paths?.length && !args.data) throw new Error("At least one of \"paths\" or \"data\" must be provided.");
-		const snap = await runtime.drop(args.target, {
-			...args.paths !== void 0 ? { paths: args.paths } : {},
-			...args.data !== void 0 ? { data: args.data } : {}
-		});
-		if (!snap) return textResult(`Dropped data onto "${args.element ?? args.target}".`);
-		return textResult(formatSnapshot(snap));
-	}
-})];
-var screenshot_default = [defineTool({
-	schema: {
-		name: "browser_take_screenshot",
-		title: "Browser Take Screenshot",
-		description: "Capture a full-page screenshot of the active tab as a base64-encoded PNG.",
-		inputSchema: object({
-			element: string().optional().describe("Human-readable description of the area to screenshot"),
-			target: string().optional().describe("Element reference or CSS selector to clip screenshot to; omit for full page"),
-			type: _enum(["png", "jpeg"]).default("png").describe("Image format for the screenshot. Default is png."),
-			filename: string().optional().describe("File name to save the screenshot to."),
-			fullPage: boolean().optional().describe("When true, takes a screenshot of the full scrollable page, instead of the currently visible viewport. Cannot be used with element screenshots.")
-		})
-	},
-	handle: async (args, runtime) => {
-		const target = args.target;
-		const result = await runtime.takeScreenshot({
-			type: args.type,
-			...args.fullPage !== void 0 ? { fullPage: args.fullPage } : {},
-			...target !== void 0 ? { target } : {}
-		});
-		if (args.filename) {
-			const resolvedFilename = await resolveOutputFilePath(args.filename, { outputDir: runtime.getOutputDir() });
-			await writeFile(resolvedFilename, Buffer.from(result.data, "base64"));
-			return textResult(`Screenshot saved to "${resolvedFilename}".`);
-		}
-		return { content: [{
-			type: "image",
-			data: result.data,
-			mimeType: result.mimeType
-		}] };
-	}
-})];
-var console_default = [defineTool({
-	schema: {
-		name: "browser_console_messages",
-		title: "Get console messages",
-		description: "Returns all console messages",
-		inputSchema: object({
-			level: _enum([
-				"error",
-				"warning",
-				"info",
-				"debug"
-			]).default("info").describe("Level of the console messages to return. Each level includes the messages of more severe levels. Defaults to \"info\"."),
-			all: boolean().optional().describe("Return all console messages since the beginning of the session, not just since the last navigation. Defaults to false."),
-			filename: string().optional().describe("Filename to save the console messages to. If not provided, messages are returned as text.")
-		})
-	},
-	handle: async (args, runtime) => {
-		const messages = await runtime.consoleMessages(args.level, args.all);
-		const errors = messages.filter((message) => message.type === "error" || message.type === "assert").length;
-		const warnings = messages.filter((message) => message.type === "warning").length;
-		const text = [
-			`Total messages: ${messages.length} (Errors: ${errors}, Warnings: ${warnings})`,
-			"",
-			...messages.map((message) => message.formattedText)
-		].join("\n");
-		if (args.filename) {
-			const resolvedFilename = await resolveOutputFilePath(args.filename, { outputDir: runtime.getOutputDir() });
-			await writeFile(resolvedFilename, text);
-			return textResult(`Saved console messages to "${resolvedFilename}".`);
-		}
-		return textResult(text);
-	}
-})];
-var evaluate_default = [defineTool({
-	schema: {
-		name: "browser_evaluate",
-		title: "Evaluate JavaScript",
-		description: "Evaluate JavaScript expression on page or element",
-		inputSchema: object({
-			element: string().optional().describe("Human-readable element description used to obtain permission to interact with the element"),
-			target: string().optional().describe("Exact target element reference from the page snapshot, or a unique element selector"),
-			function: string().describe("() => { /* code */ } or (element) => { /* code */ } when element is provided"),
-			filename: string().optional().describe("Filename to save the result to. If not provided, result is returned as text.")
-		})
-	},
-	handle: async (args, runtime) => {
-		const result = await runtime.evaluate(args.function, args.target);
-		const text = JSON.stringify(result, null, 2) ?? "undefined";
-		if (args.filename) {
-			const resolvedFilename = await resolveOutputFilePath(args.filename, { outputDir: runtime.getOutputDir() });
-			await writeFile(resolvedFilename, text);
-			return textResult(`Saved evaluation result to "${resolvedFilename}".`);
-		}
-		return textResult(text);
-	}
-})];
-var dialog_default = [defineTool({
-	schema: {
-		name: "browser_handle_dialog",
-		title: "Handle a dialog",
-		description: "Handle a dialog",
-		inputSchema: object({
-			accept: boolean().describe("Whether to accept the dialog."),
-			promptText: string().optional().describe("The text of the prompt in case of a prompt dialog.")
-		})
-	},
-	handle: async (args, runtime) => {
-		const snap = await runtime.handleDialog(args.accept, args.promptText);
-		if (!snap) return textResult(args.accept ? "Accepted dialog." : "Dismissed dialog.");
-		return textResult(formatSnapshot(snap));
-	}
-})];
-//#endregion
-//#region src/mcp/tools/network.ts
+//#region src/mcp/backend/network.ts
 var requestParts = [
 	"request-headers",
 	"request-body",
 	"response-headers",
 	"response-body"
 ];
-var networkRequests = defineTool({
+var networkRequests = defineTool$1({
+	capability: "core",
 	schema: {
 		name: "browser_network_requests",
 		title: "List network requests",
@@ -74030,10 +74078,11 @@ var networkRequests = defineTool({
 			static: boolean().default(false).describe("Whether to include successful static resources like images, fonts, scripts, etc. Defaults to false."),
 			filter: string().optional().describe("Only return requests whose URL matches this regexp (e.g. \"/api/.*user\")."),
 			filename: string().optional().describe("Filename to save the network requests to. If not provided, requests are returned as text.")
-		})
+		}),
+		type: "readOnly"
 	},
-	handle: async (args, runtime) => {
-		const requests = await runtime.networkRequests();
+	handle: async (context, args, response) => {
+		const requests = await context.runtime.networkRequests();
 		const filter = args.filter ? new RegExp(args.filter) : void 0;
 		const lines = [];
 		let hiddenStaticCount = 0;
@@ -74048,14 +74097,16 @@ var networkRequests = defineTool({
 		if (hiddenStaticCount > 0) lines.push(`\nNote: ${hiddenStaticCount} static request${hiddenStaticCount === 1 ? "" : "s"} not shown, run with "static" option to see ${hiddenStaticCount === 1 ? "it" : "them"}.`);
 		const text = lines.join("\n");
 		if (args.filename) {
-			const resolvedFilename = await resolveOutputFilePath(args.filename, { outputDir: runtime.getOutputDir() });
+			const resolvedFilename = await context.resolveOutputFile(args.filename);
 			await writeFile(resolvedFilename, text);
-			return textResult(`Saved network requests to "${resolvedFilename}".`);
+			response.addTextResult(`Saved network requests to "${resolvedFilename}".`);
+			return;
 		}
-		return textResult(text);
+		response.addTextResult(text);
 	}
 });
-var networkRequest = defineTool({
+var networkRequest = defineTool$1({
+	capability: "core",
 	schema: {
 		name: "browser_network_request",
 		title: "Show network request details",
@@ -74064,18 +74115,33 @@ var networkRequest = defineTool({
 			index: number().int().min(1).describe("1-based index of the request, as printed by browser_network_requests."),
 			part: _enum(requestParts).optional().describe("Return only this part of the request. Omit to return full details."),
 			filename: string().optional().describe("Filename to save the result to. If not provided, output is returned as text.")
-		})
+		}),
+		type: "readOnly"
 	},
-	handle: async (args, runtime) => {
-		const request = await runtime.networkRequest(args.index);
-		if (!request) return textResult(`Request #${args.index} not found. Use browser_network_requests to see available indexes.`, true);
-		const text = args.part ? renderRequestPart(request, args.part) : renderRequestDetails(request);
+	handle: async (context, args, response) => {
+		const request = await context.runtime.networkRequest(args.index);
+		if (!request) {
+			response.addError(`Request #${args.index} not found. Use browser_network_requests to see available indexes.`);
+			return;
+		}
+		if (args.part) {
+			response.setRawResults();
+			const partText = args.part === "response-body" ? await context.runtime.fetchResponseBody(args.index) ?? "" : renderRequestPart(request, args.part);
+			if (args.filename) {
+				const resolvedFilename = await context.resolveOutputFile(args.filename);
+				await writeFile(resolvedFilename, partText);
+				response.addTextResult(`Saved network request to "${resolvedFilename}".`);
+			} else response.addTextResult(partText);
+			return;
+		}
+		const text = renderRequestDetails(request);
 		if (args.filename) {
-			const resolvedFilename = await resolveOutputFilePath(args.filename, { outputDir: runtime.getOutputDir() });
+			const resolvedFilename = await context.resolveOutputFile(args.filename);
 			await writeFile(resolvedFilename, text);
-			return textResult(`Saved network request to "${resolvedFilename}".`);
+			response.addTextResult(`Saved network request to "${resolvedFilename}".`);
+			return;
 		}
-		return textResult(text);
+		response.addTextResult(text);
 	}
 });
 function isSuccessfulResponse(request) {
@@ -74102,8 +74168,10 @@ function renderRequestDetails(request) {
 	if (request.mimeType) lines.push(`    mimeType:  ${request.mimeType}`);
 	appendHeaders(lines, "Request headers", request.requestHeaders);
 	if (request.responseHeaders) appendHeaders(lines, "Response headers", request.responseHeaders);
-	if (request.requestBody) lines.push("", `Call browser_network_request with part="request-body" to read the request body.`);
-	if (request.responseBody) lines.push("", `Call browser_network_request with part="response-body" to read the response body.`);
+	const hints = [];
+	if (request.requestBody) hints.push(`Call browser_network_request with part="request-body" to read the request body.`);
+	if (canHaveResponseBody(request)) hints.push(`Call browser_network_request with part="response-body" to read the response body.`);
+	if (hints.length) lines.push("", ...hints);
 	return lines.join("\n");
 }
 function renderRequestPart(request, part) {
@@ -74122,46 +74190,247 @@ function appendHeaders(lines, title, headers) {
 function renderHeaders(headers) {
 	return Object.entries(headers).map(([key, value]) => `${key}: ${value}`).join("\n");
 }
+function canHaveResponseBody(request) {
+	if (request.failureText || request.status === void 0) return false;
+	return request.status !== 204 && request.status !== 304 && !(request.status >= 100 && request.status < 200);
+}
 var network_default = [networkRequests, networkRequest];
-var runCode_default = [defineTool({
+var runCode_default = [defineTool$1({
+	capability: "devtools",
 	schema: {
 		name: "browser_run_code_unsafe",
-		title: "Run Playwright code (unsafe)",
-		description: "Run a Playwright code snippet. Unsafe: executes arbitrary JavaScript in the browser context approximation and is RCE-equivalent in intent.",
+		title: "Run code (unsafe)",
+		description: "Run arbitrary code against the current browser session.",
+		inputSchema: object({ code: string().describe("JavaScript code to run against the browser session.") }),
+		type: "action"
+	},
+	handle: async (context, args, response) => {
+		const result = await context.runtime.runCodeUnsafe(args.code);
+		response.addTextResult(JSON.stringify(result, null, 2) ?? "undefined");
+	}
+})];
+var screenshot_default = [defineTool$1({
+	capability: "core",
+	schema: {
+		name: "browser_take_screenshot",
+		title: "Browser Take Screenshot",
+		description: "Capture a full-page screenshot of the active tab as a base64-encoded PNG.",
 		inputSchema: object({
-			code: string().optional().describe("A JavaScript function containing Playwright-like code to execute."),
-			filename: string().optional().describe("Load code from the specified file. If both code and filename are provided, code will be ignored.")
-		})
+			element: string().optional().describe("Human-readable description of the area to screenshot"),
+			target: string().optional().describe("Element reference or CSS selector to clip screenshot to; omit for full page"),
+			type: _enum(["png", "jpeg"]).default("png").describe("Image format for the screenshot. Default is png."),
+			filename: string().optional().describe("File name to save the screenshot to."),
+			fullPage: boolean().optional().describe("When true, takes a screenshot of the full scrollable page, instead of the currently visible viewport. Cannot be used with element screenshots.")
+		}),
+		type: "readOnly"
 	},
-	handle: async (args, runtime) => {
-		const code = args.filename ? await readFile(args.filename, "utf8") : args.code;
-		if (!code) throw new Error("Either code or filename must be provided.");
-		const result = await runtime.runCodeUnsafe(code);
-		return textResult(JSON.stringify(result, null, 2) ?? "undefined");
+	handle: async (context, args, response) => {
+		const result = await context.runtime.takeScreenshot({
+			type: args.type,
+			...args.fullPage !== void 0 ? { fullPage: args.fullPage } : {},
+			...args.target !== void 0 ? { target: args.target } : {}
+		});
+		const requestedFilename = args.filename?.trim();
+		const resolvedFilename = await context.resolveOutputFile(requestedFilename || `page-${(/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-")}.${args.type}`);
+		await writeFile(resolvedFilename, Buffer.from(result.data, "base64"));
+		if (requestedFilename) {
+			response.addTextResult(`Screenshot saved to "${resolvedFilename}".`);
+			return;
+		}
+		response.addTextResult(resolvedFilename);
+		response.addImageResult(result.data, result.mimeType);
+	}
+})];
+var tabs_default = [defineTool$1({
+	capability: "core-tabs",
+	schema: {
+		name: "browser_tabs",
+		title: "Browser Tabs",
+		description: "List, create, select, and close browser tabs for the current MCP browser session.",
+		inputSchema: object({
+			action: _enum([
+				"list",
+				"new",
+				"select",
+				"close"
+			]).describe("Operation to perform"),
+			index: number().optional().describe("Tab index, used for close/select. If omitted for close, current tab is closed."),
+			url: string().optional().describe("URL to navigate to in the new tab, used for new.")
+		}),
+		type: "action"
+	},
+	handle: async (context, params, response) => {
+		switch (params.action) {
+			case "list":
+				await context.ensureTab();
+				break;
+			case "new":
+				await context.runtime.newTab(params.url);
+				if (params.url) {
+					response.setIncludeSnapshot();
+					response.addCode(`await page.goto('${params.url}');`);
+				}
+				break;
+			case "close":
+				await context.runtime.closeTab(params.index ?? 0);
+				break;
+			case "select":
+				if (params.index === void 0) throw new Error("Tab index is required");
+				await context.runtime.selectTab(params.index);
+				break;
+		}
+		const tabs = await context.runtime.listTabs();
+		response.addTextResult(formatTabs(tabs));
 	}
 })];
 //#endregion
-//#region src/mcp/tools/index.ts
-var allTools = [
-	...connect_default,
+//#region src/mcp/backend/tools.ts
+var browserTools = [
 	...common_default,
-	...tabs_default,
-	...navigate_default,
-	...mouse_default,
-	...keyboard_default,
-	...form_default,
-	...screenshot_default,
 	...console_default,
+	...connect_default,
+	...dialogs_default,
 	...evaluate_default,
-	...dialog_default,
+	...files_default,
+	...keyboard_default,
+	...navigate_default,
 	...network_default,
-	...runCode_default
+	...runCode_default,
+	...screenshot_default,
+	...snapshot_default,
+	...tabs_default
 ];
 //#endregion
+//#region src/mcp/errors.ts
+var McpToolError = class extends Error {
+	code;
+	constructor(code, message) {
+		super(message);
+		this.code = code;
+		this.name = "McpToolError";
+	}
+};
+function isMcpToolError(error) {
+	return error instanceof McpToolError;
+}
+//#endregion
+//#region src/mcp/tool.ts
+function defineTool(tool) {
+	return tool;
+}
+function textResult(text, isError = false) {
+	return {
+		content: [{
+			type: "text",
+			text
+		}],
+		...isError ? { isError: true } : {}
+	};
+}
+object({
+	element: string().optional().describe("Human-readable element description used to obtain permission to interact with the element"),
+	target: string().describe("Exact target element reference from the page snapshot, or a unique element selector")
+}).extend({
+	doubleClick: boolean().optional().describe("Whether to perform a double click instead of a single click"),
+	button: _enum([
+		"left",
+		"right",
+		"middle"
+	]).optional().describe("Button to click, defaults to left"),
+	modifiers: array(_enum([
+		"Alt",
+		"Control",
+		"ControlOrMeta",
+		"Meta",
+		"Shift"
+	])).optional().describe("Modifier keys to press during the click"),
+	human: object({ profile: _enum([
+		"cautious",
+		"balanced",
+		"fast"
+	]).optional().describe("Humanization timing profile, defaults to balanced") }).optional().describe("Humanization settings for this click")
+});
+object({
+	startElement: string().optional().describe("Human-readable source element description used to obtain the permission to interact with the element"),
+	startTarget: string().describe("Exact target element reference from the page snapshot, or a unique element selector"),
+	endElement: string().optional().describe("Human-readable target element description used to obtain the permission to interact with the element"),
+	endTarget: string().describe("Exact target element reference from the page snapshot, or a unique element selector")
+});
+object({
+	element: string().optional().describe("Human-readable element description used to obtain permission"),
+	ref: string().optional().describe("Element to scroll; omit to scroll the whole page"),
+	deltaX: number().optional().describe("Horizontal scroll delta in pixels (default 0)"),
+	deltaY: number().optional().describe("Vertical scroll delta in pixels (default 0)")
+});
+var mouse_default = [];
+object({
+	element: string().optional().describe("Human-readable element description used to obtain permission"),
+	target: string().describe("Exact target element reference from the page snapshot, or a unique element selector")
+}).extend({ values: array(string()).describe("Option values or visible labels to select") });
+object({ paths: array(string()).optional().describe("The absolute paths to the files to upload. Can be single file or multiple files. If omitted, file chooser is cancelled.") });
+var form_default = [defineTool({
+	schema: {
+		name: "browser_fill_form",
+		title: "Fill form",
+		description: "Fill multiple form fields",
+		inputSchema: object({ fields: array(object({
+			name: string().describe("Human-readable field name"),
+			type: _enum([
+				"textbox",
+				"checkbox",
+				"radio",
+				"combobox",
+				"slider"
+			]).describe("Type of the field"),
+			target: string().describe("Exact target element reference from the page snapshot, or a unique element selector"),
+			value: string().describe("Value to fill in the field. If the field is a checkbox, the value should be `true` or `false`. If the field is a combobox, the value should be the text of the option.")
+		})).describe("Fields to fill in") })
+	},
+	handle: async (args, runtime) => {
+		const snap = await runtime.fillForm(args.fields);
+		if (!snap) return textResult("Filled form.");
+		return textResult(formatSnapshot(snap));
+	}
+}), defineTool({
+	schema: {
+		name: "browser_drop",
+		title: "Drop files or data onto an element",
+		description: "Drop files or MIME-typed data onto an element, as if dragged from outside the page. At least one of paths or data must be provided.",
+		inputSchema: object({
+			element: string().optional().describe("Human-readable element description used to obtain permission to interact with the element"),
+			target: string().describe("Exact target element reference from the page snapshot, or a unique element selector"),
+			paths: array(string()).optional().describe("Absolute paths to files to drop onto the element."),
+			data: record(string(), string()).optional().describe("Data to drop, as a map of MIME type to string value.")
+		})
+	},
+	handle: async (args, runtime) => {
+		if (!args.paths?.length && !args.data) throw new Error("At least one of \"paths\" or \"data\" must be provided.");
+		const snap = await runtime.drop(args.target, {
+			...args.paths !== void 0 ? { paths: args.paths } : {},
+			...args.data !== void 0 ? { data: args.data } : {}
+		});
+		if (!snap) return textResult(`Dropped data onto "${args.element ?? args.target}".`);
+		return textResult(formatSnapshot(snap));
+	}
+})];
+//#endregion
+//#region src/mcp/tools/index.ts
+var allTools = [...mouse_default, ...form_default];
+//#endregion
 //#region src/mcp/connectedBrowser.ts
 function delay$1(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
+async function withBiDiTimeout(promise, timeoutMs) {
+	let timer;
+	try {
+		return await Promise.race([promise, new Promise((_, reject) => {
+			timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Timed out after ${timeoutMs}ms.`)), timeoutMs);
+		})]);
+	} finally {
+		if (timer) clearTimeout(timer);
+	}
+}
 var chromeRemoteInterface = "default" in import_chrome_remote_interface ? import_chrome_remote_interface.default : import_chrome_remote_interface;
 function buildConnectionFromWsEndpoint(browserWsEndpoint) {
 	const parsed = new URL(browserWsEndpoint);
@@ -74595,13 +74864,13 @@ var CDP_KEY_MAP = {
 async function evaluateBiDi(client, contextId, functionSource, arg) {
 	const expression = arg === void 0 ? `(${functionSource})()` : `(${functionSource})(${JSON.stringify(arg)})`;
 	const response = await client.scriptEvaluate({
-		expression,
+		expression: wrapWithSerializedEvaluationResult(expression),
 		target: { context: contextId },
 		awaitPromise: true,
 		resultOwnership: "none"
 	});
 	if (response.type === "exception") throw new Error(response.exceptionDetails?.text || "BiDi runtime evaluation failed.");
-	return response.result?.value;
+	return parseSerializedEvaluationResult(extractBiDiValue(response.result));
 }
 async function evaluateBiDiRef(client, contextId, functionSource, arg) {
 	const expression = arg === void 0 ? `(${functionSource})()` : `(${functionSource})(${JSON.stringify(arg)})`;
@@ -74623,6 +74892,16 @@ async function evaluateBiDiRef(client, contextId, functionSource, arg) {
 		...response.result?.value?.handle !== void 0 ? { handle: response.result.value.handle } : {}
 	};
 }
+function extractBiDiValue(value) {
+	if (!value) return;
+	if (value.type === "array" && Array.isArray(value.value)) return value.value.map((entry) => extractBiDiValue(entry));
+	if (value.type === "object" && Array.isArray(value.value)) {
+		const obj = {};
+		for (const [key, val] of value.value) obj[key] = extractBiDiValue(val);
+		return obj;
+	}
+	return value.value;
+}
 function toAriaSnapshotPayload(request = {}) {
 	return {
 		options: normalizeAriaSnapshotOptions({
@@ -74662,6 +74941,7 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 	pageConsoleStates = /* @__PURE__ */ new Map();
 	pageNetworkStates = /* @__PURE__ */ new Map();
 	pageDialogStates = /* @__PURE__ */ new Map();
+	dialogWaiters = /* @__PURE__ */ new Map();
 	activeTabId;
 	versionString = "Chromium/unknown";
 	constructor(browserClient, connection) {
@@ -74677,7 +74957,7 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 		});
 		const session = new CdpConnectedBrowserSession(await chromeRemoteInterface({ target: connection.browserWsEndpoint }), connection);
 		session.versionString = version.Browser;
-		if ((await session.refreshTabs()).length === 0) await session.newTab();
+		await session.refreshTabs();
 		await session.getActivePageClient().catch(() => void 0);
 		return session;
 	}
@@ -74729,6 +75009,7 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 	async click(target, options) {
 		const pageClient = await this.getActivePageClient();
 		const contextId = await this.getActiveUtilityContextId(pageClient);
+		const tabId = await this.getActiveTabId();
 		const point = await evaluateCdp(pageClient, "nodeToken" in target ? ACTION_POINT_EVALUATE_SOURCE : ACTION_POINT_BY_SELECTOR_SOURCE, "nodeToken" in target ? { nodeToken: target.nodeToken } : { selector: target.selector }, contextId);
 		if (!point.ok || point.x === void 0 || point.y === void 0) {
 			const isSelector = "selector" in target;
@@ -74762,7 +75043,7 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 				modifiers: modifiersMask
 			});
 			await delay$1(options.clickHoldMs);
-			await pageClient.Input.dispatchMouseEvent({
+			const releasePromise = pageClient.Input.dispatchMouseEvent({
 				type: "mouseReleased",
 				x: point.x,
 				y: point.y,
@@ -74770,6 +75051,7 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 				clickCount,
 				modifiers: modifiersMask
 			});
+			await Promise.race([releasePromise, this.waitForDialog(tabId, options.clickHoldMs + 1e3)]);
 		}
 	}
 	async drag(start, end, options) {
@@ -75025,24 +75307,72 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 		}
 	}
 	async handleDialog(accept, promptText) {
-		const tabId = await this.getActiveTabId();
+		const tabId = this.dialogTabId();
 		if (!this.pageDialogStates.has(tabId)) throw new McpToolError("no_dialog", "No dialog visible.");
-		const pageClient = await this.getActivePageClient();
+		const pageClient = this.pageClients.get(tabId) ?? await this.getActivePageClient();
 		this.pageDialogStates.delete(tabId);
 		await pageClient.Page.handleJavaScriptDialog({
 			accept,
 			...promptText !== void 0 ? { promptText } : {}
 		});
 	}
+	async hasDialog() {
+		return this.pageDialogStates.size > 0;
+	}
+	waitForDialog(tabId, timeoutMs) {
+		if (this.pageDialogStates.has(tabId)) return Promise.resolve();
+		return new Promise((resolve) => {
+			const waiter = { resolve: () => {
+				if (waiter.timer) clearTimeout(waiter.timer);
+				this.removeDialogWaiter(tabId, waiter);
+				resolve();
+			} };
+			waiter.timer = setTimeout(() => waiter.resolve(), timeoutMs);
+			const waiters = this.dialogWaiters.get(tabId) ?? /* @__PURE__ */ new Set();
+			waiters.add(waiter);
+			this.dialogWaiters.set(tabId, waiters);
+		});
+	}
+	resolveDialogWaiters(tabId) {
+		const waiters = this.dialogWaiters.get(tabId);
+		if (!waiters) return;
+		this.dialogWaiters.delete(tabId);
+		for (const waiter of waiters) waiter.resolve();
+	}
+	removeDialogWaiter(tabId, waiter) {
+		const waiters = this.dialogWaiters.get(tabId);
+		if (!waiters) return;
+		waiters.delete(waiter);
+		if (waiters.size === 0) this.dialogWaiters.delete(tabId);
+	}
 	async networkRequests() {
 		const tabId = await this.getActiveTabId();
+		await this.hydratePerformanceResourceRequests(tabId);
 		return this.ensureNetworkState(tabId).requests.map(cloneNetworkRequest);
 	}
 	async networkRequest(index) {
 		const tabId = await this.getActiveTabId();
+		await this.hydratePerformanceResourceRequests(tabId);
 		const request = this.ensureNetworkState(tabId).requests[index - 1];
 		return request ? cloneNetworkRequest(request) : void 0;
 	}
+	async fetchResponseBody(index) {
+		const tabId = await this.getActiveTabId();
+		const state = this.ensureNetworkState(tabId);
+		const request = state.requests[index - 1];
+		if (!request || !request.requestId) return request?.responseBody;
+		if (!canReadResponseBody(request)) return;
+		if (request.responseBody !== void 0) return request.responseBody;
+		await waitForLoadingDone(state, request.requestId, 5e3).catch(() => void 0);
+		if (request.responseBody !== void 0) return request.responseBody;
+		if (state.bodyRead.has(request.requestId)) return;
+		state.bodyRead.add(request.requestId);
+		const clientNetwork = (this.pageClients.get(tabId) ?? await this.getActivePageClient()).Network;
+		if (!clientNetwork) return;
+		const body = await clientNetwork.getResponseBody({ requestId: request.requestId }).catch(() => void 0);
+		if (body) request.responseBody = body.base64Encoded ? Buffer.from(body.body, "base64").toString("utf8") : body.body;
+		return request.responseBody;
+	}
 	async runCodeUnsafe(code) {
 		const pageClient = await this.getActivePageClient();
 		const contextId = await this.getActiveUtilityContextId(pageClient);
@@ -75102,6 +75432,12 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 		if (!activeTab) throw new McpToolError("no_active_tab", "No active tab is available.");
 		return activeTab.id;
 	}
+	dialogTabId() {
+		if (this.activeTabId && this.pageDialogStates.has(this.activeTabId)) return this.activeTabId;
+		const tabId = this.pageDialogStates.keys().next().value;
+		if (!tabId) throw new McpToolError("no_dialog", "No dialog visible.");
+		return tabId;
+	}
 	async getActivePageClient() {
 		const activeTab = (await this.refreshTabs()).find((tab) => tab.active);
 		if (!activeTab) throw new McpToolError("no_active_tab", "No active tab is available.");
@@ -75183,6 +75519,7 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 				...event.defaultPrompt !== void 0 ? { defaultPrompt: event.defaultPrompt } : {},
 				...event.url !== void 0 ? { url: event.url } : {}
 			});
+			this.resolveDialogWaiters(tabId);
 		});
 		this.installNetworkCollection(tabId, client);
 	}
@@ -75221,20 +75558,29 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 		});
 		client.Network.loadingFinished(async (event) => {
 			const request = state.byRequestId.get(event.requestId);
-			if (!request) return;
+			if (!request) {
+				resolveLoadingDone(state, event.requestId, true);
+				return;
+			}
 			const startedAt = state.startedAt.get(event.requestId);
 			if (startedAt !== void 0 && event.timestamp !== void 0) request.durationMs = Math.round(event.timestamp * 1e3 - startedAt);
-			if (canReadResponseBody(request)) {
+			if (canReadResponseBody(request) && !state.bodyRead.has(event.requestId)) {
+				state.bodyRead.add(event.requestId);
 				const body = await client.Network?.getResponseBody({ requestId: event.requestId }).catch(() => void 0);
 				if (body) request.responseBody = body.base64Encoded ? Buffer.from(body.body, "base64").toString("utf8") : body.body;
 			}
+			resolveLoadingDone(state, event.requestId, true);
 		});
 		client.Network.loadingFailed((event) => {
 			const request = state.byRequestId.get(event.requestId);
-			if (!request) return;
+			if (!request) {
+				resolveLoadingDone(state, event.requestId, false);
+				return;
+			}
 			request.failureText = event.errorText ?? "Unknown error";
 			const startedAt = state.startedAt.get(event.requestId);
 			if (startedAt !== void 0 && event.timestamp !== void 0) request.durationMs = Math.round(event.timestamp * 1e3 - startedAt);
+			resolveLoadingDone(state, event.requestId, false);
 		});
 	}
 	ensureConsoleState(tabId) {
@@ -75256,7 +75602,10 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 			state = {
 				requests: [],
 				byRequestId: /* @__PURE__ */ new Map(),
-				startedAt: /* @__PURE__ */ new Map()
+				startedAt: /* @__PURE__ */ new Map(),
+				hydratedPerformanceResources: false,
+				loadingDone: /* @__PURE__ */ new Map(),
+				bodyRead: /* @__PURE__ */ new Set()
 			};
 			this.pageNetworkStates.set(tabId, state);
 		}
@@ -75272,10 +75621,79 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 		this.pageNetworkStates.set(tabId, {
 			requests: [],
 			byRequestId: /* @__PURE__ */ new Map(),
-			startedAt: /* @__PURE__ */ new Map()
+			startedAt: /* @__PURE__ */ new Map(),
+			hydratedPerformanceResources: false,
+			loadingDone: /* @__PURE__ */ new Map(),
+			bodyRead: /* @__PURE__ */ new Set()
 		});
 		this.pageDialogStates.delete(tabId);
 	}
+	async hydratePerformanceResourceRequests(tabId) {
+		const state = this.ensureNetworkState(tabId);
+		if (state.hydratedPerformanceResources) return;
+		state.hydratedPerformanceResources = true;
+		const pageClient = await this.getActivePageClient();
+		const contextId = await this.getActiveUtilityContextId(pageClient);
+		const documentRequest = await evaluateCdp(pageClient, String.raw`() => {
+        const navigation = performance.getEntriesByType("navigation")[0];
+        return {
+          url: String(location.href || ""),
+          duration: navigation ? Math.round(Number(navigation.duration || 0)) : undefined
+        };
+      }`, void 0, contextId).catch(() => void 0);
+		if (documentRequest?.url && !Array.from(state.byRequestId.values()).some((request) => request.url === documentRequest.url)) {
+			const requestId = `performance:navigation:${documentRequest.url}`;
+			const request = {
+				index: state.requests.length + 1,
+				requestId,
+				method: "GET",
+				url: documentRequest.url,
+				resourceType: "document",
+				requestHeaders: {},
+				status: 200,
+				statusText: "OK",
+				...documentRequest.duration !== void 0 ? { durationMs: documentRequest.duration } : {}
+			};
+			state.requests.push(request);
+			state.byRequestId.set(requestId, request);
+		}
+		const resources = await evaluateCdp(pageClient, String.raw`() => performance.getEntriesByType("resource").map((entry) => ({
+        name: String(entry.name || ""),
+        initiatorType: String(entry.initiatorType || "other"),
+        duration: Math.round(Number(entry.duration || 0)),
+        responseStatus: typeof entry.responseStatus === "number" ? entry.responseStatus : undefined
+      }))`, void 0, contextId).catch(() => []);
+		for (const resource of resources) {
+			if (!resource.name || Array.from(state.byRequestId.values()).some((request) => request.url === resource.name)) continue;
+			const status = resource.responseStatus && resource.responseStatus > 0 ? resource.responseStatus : await this.probeResourceStatus(pageClient, contextId, resource.name);
+			const requestId = `performance:${resource.name}`;
+			const request = {
+				index: state.requests.length + 1,
+				requestId,
+				method: "GET",
+				url: resource.name,
+				resourceType: normalizeResourceType(resource.initiatorType),
+				requestHeaders: {},
+				...status !== void 0 ? {
+					status,
+					statusText: statusTextForStatus(status)
+				} : {},
+				...resource.duration !== void 0 ? { durationMs: resource.duration } : {}
+			};
+			state.requests.push(request);
+			state.byRequestId.set(requestId, request);
+		}
+	}
+	async probeResourceStatus(pageClient, contextId, url) {
+		return evaluateCdp(pageClient, String.raw`async (url) => {
+        try {
+          const response = await fetch(url, { method: "HEAD", cache: "no-store" });
+          return response.status;
+        } catch {
+          return undefined;
+        }
+      }`, url, contextId).catch(() => void 0);
+	}
 	addConsoleMessage(tabId, message) {
 		const state = this.ensureConsoleState(tabId);
 		if (!shouldIncludeConsoleMessage(message.type)) return;
@@ -75409,6 +75827,45 @@ function canReadResponseBody(request) {
 	if (request.failureText || request.status === void 0) return false;
 	return request.status !== 204 && request.status !== 304 && !(request.status >= 100 && request.status < 200);
 }
+function loadingDoneEntry(state, requestId) {
+	let entry = state.loadingDone.get(requestId);
+	if (!entry) {
+		let resolve;
+		let reject;
+		entry = {
+			promise: new Promise((res, rej) => {
+				resolve = res;
+				reject = rej;
+			}),
+			resolve,
+			reject
+		};
+		state.loadingDone.set(requestId, entry);
+	}
+	return entry;
+}
+function resolveLoadingDone(state, requestId, success) {
+	const entry = state.loadingDone.get(requestId);
+	if (!entry) return;
+	state.loadingDone.delete(requestId);
+	if (success) entry.resolve();
+	else entry.reject(/* @__PURE__ */ new Error("Request failed before the response body was available."));
+}
+async function waitForLoadingDone(state, requestId, timeoutMs) {
+	const entry = loadingDoneEntry(state, requestId);
+	await Promise.race([entry.promise, new Promise((resolve) => setTimeout(resolve, timeoutMs))]);
+}
+function statusTextForStatus(status) {
+	if (status === 200) return "OK";
+	if (status === 204) return "No Content";
+	if (status === 304) return "Not Modified";
+	if (status === 400) return "Bad Request";
+	if (status === 401) return "Unauthorized";
+	if (status === 403) return "Forbidden";
+	if (status === 404) return "Not Found";
+	if (status === 500) return "Internal Server Error";
+	return "";
+}
 function cloneNetworkRequest(request) {
 	return {
 		...request,
@@ -75487,9 +75944,11 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 	pageConsoleStates = /* @__PURE__ */ new Map();
 	pageNetworkStates = /* @__PURE__ */ new Map();
 	pageDialogStates = /* @__PURE__ */ new Map();
+	dialogWaiters = /* @__PURE__ */ new Map();
 	bidiListeners = /* @__PURE__ */ new Map();
 	responseDataCollector;
 	activeTabId;
+	ownsSession = false;
 	constructor(client) {
 		this.client = client;
 	}
@@ -75497,12 +75956,14 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 		if (args.browser && args.browser !== "firefox") throw new McpToolError("unsupported_protocol_input", "BiDi attach only supports browser \"firefox\" in v1.");
 		const parsed = new URL(args.endpoint);
 		if (parsed.protocol !== "ws:" && parsed.protocol !== "wss:") throw new McpToolError("unsupported_protocol_input", `BiDi endpoint must be a ws(s) URL. Received "${parsed.protocol}".`);
-		const session = new BidiConnectedBrowserSession(await getBidiClientFactory()({
+		const client = await getBidiClientFactory()({
 			browserName: "firefox",
-			webSocketUrl: args.endpoint
-		}));
+			webSocketUrl: normalizeFirefoxBidiEndpoint(args.endpoint, args.sessionId)
+		});
+		const session = new BidiConnectedBrowserSession(client);
+		session.ownsSession = await ensureMcpBiDiSession(client, args.endpoint, args.sessionId);
 		await session.initialize();
-		if ((await session.refreshTabs()).length === 0) await session.newTab();
+		await session.refreshTabs();
 		return session;
 	}
 	async version() {
@@ -75545,10 +76006,13 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 	}
 	async snapshot(request = {}) {
 		const tabId = await this.getActiveTabId();
-		return toBrowserSnapshot(await evaluateBiDi(this.client, tabId, PLAYWRIGHT_ARIA_SNAPSHOT_EVALUATE_SOURCE, toAriaSnapshotPayload(request)), request, {
-			console: this.consoleSummary(tabId),
-			consoleLink: await this.takeConsoleLink(tabId)
-		});
+		return {
+			...toBrowserSnapshot(await retryUntilReady(() => evaluateBiDi(this.client, tabId, PLAYWRIGHT_ARIA_SNAPSHOT_EVALUATE_SOURCE, toAriaSnapshotPayload(request))), request, {
+				console: this.consoleSummary(tabId),
+				consoleLink: await this.takeConsoleLink(tabId)
+			}),
+			retryable: true
+		};
 	}
 	async consoleMessages(level = "info", all = false) {
 		const activeTabId = await this.getActiveTabId();
@@ -75651,10 +76115,12 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 			parameters: { pointerType: "mouse" },
 			actions: pointerActions
 		});
-		await this.client.inputPerformActions({
+		const performPromise = this.client.inputPerformActions({
 			context: tabId,
 			actions
 		});
+		await Promise.race([performPromise, this.waitForDialog(tabId, options.clickHoldMs + 5e3)]);
+		performPromise.catch(() => {});
 		await this.client.inputReleaseActions({ context: tabId }).catch(() => {});
 	}
 	async drag(start, end, options) {
@@ -75747,7 +76213,7 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 			await this.client.networkRemoveDataCollector({ collector: this.responseDataCollector }).catch(() => {});
 			this.responseDataCollector = void 0;
 		}
-		await this.client.sessionEnd({}).catch(() => {});
+		if (this.ownsSession) await this.client.sessionEnd({}).catch(() => {});
 		this.client.close();
 	}
 	async navigate(url) {
@@ -75955,14 +76421,17 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 		}
 	}
 	async handleDialog(accept, promptText) {
-		const tabId = await this.getActiveTabId();
+		const tabId = this.dialogTabId();
 		if (!this.pageDialogStates.has(tabId)) throw new McpToolError("no_dialog", "No dialog visible.");
 		this.pageDialogStates.delete(tabId);
-		await this.client.browsingContextHandleUserPrompt({
+		await withBiDiTimeout(this.client.browsingContextHandleUserPrompt({
 			context: tabId,
 			accept,
 			...promptText !== void 0 ? { userText: promptText } : {}
-		});
+		}), 5e3);
+	}
+	async hasDialog() {
+		return this.pageDialogStates.size > 0;
 	}
 	async networkRequests() {
 		const tabId = await this.getActiveTabId();
@@ -75973,6 +76442,15 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 		const request = this.ensureNetworkState(tabId).requests[index - 1];
 		return request ? cloneNetworkRequest(request) : void 0;
 	}
+	async fetchResponseBody(index) {
+		const tabId = await this.getActiveTabId();
+		const request = this.ensureNetworkState(tabId).requests[index - 1];
+		if (!request || !request.requestId) return request?.responseBody;
+		if (request.responseBody !== void 0) return request.responseBody;
+		const body = await this.getResponseBody(request.requestId).catch(() => void 0);
+		if (body !== void 0) request.responseBody = body;
+		return request.responseBody;
+	}
 	async runCodeUnsafe(code) {
 		return this.evaluate(`async () => {
       const fn = eval(${JSON.stringify(`(${code})`)});
@@ -75988,6 +76466,7 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
     }`);
 	}
 	async initialize() {
+		this.attachBiDiListeners();
 		await this.client.sessionSubscribe({ events: [
 			"browsingContext.userPromptOpened",
 			"log.entryAdded",
@@ -76001,7 +76480,6 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 			maxEncodedDataSize: 1e7
 		}).catch(() => void 0);
 		this.responseDataCollector = collectorResult?.collector;
-		this.attachBiDiListeners();
 	}
 	attachBiDiListeners() {
 		this.attachBiDiListener("log.entryAdded", (payload) => this.handleLogEntry(payload));
@@ -76036,6 +76514,45 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 	targetArg(target) {
 		return "nodeToken" in target ? { nodeToken: target.nodeToken } : { selector: target.selector };
 	}
+	dialogTabId() {
+		if (this.activeTabId && this.pageDialogStates.has(this.activeTabId)) return this.activeTabId;
+		const tabId = this.pageDialogStates.keys().next().value;
+		if (!tabId) throw new McpToolError("no_dialog", "No dialog visible.");
+		return tabId;
+	}
+	waitForDialog(tabId, timeoutMs) {
+		if (this.pageDialogStates.has(tabId)) return Promise.resolve();
+		return new Promise((resolve, reject) => {
+			const waiter = {
+				resolve: () => {
+					if (waiter.timer) clearTimeout(waiter.timer);
+					this.removeDialogWaiter(tabId, waiter);
+					resolve();
+				},
+				reject: (error) => {
+					if (waiter.timer) clearTimeout(waiter.timer);
+					this.removeDialogWaiter(tabId, waiter);
+					reject(error);
+				}
+			};
+			waiter.timer = setTimeout(() => waiter.reject?.(/* @__PURE__ */ new Error("Timed out waiting for dialog.")), timeoutMs);
+			const waiters = this.dialogWaiters.get(tabId) ?? /* @__PURE__ */ new Set();
+			waiters.add(waiter);
+			this.dialogWaiters.set(tabId, waiters);
+		});
+	}
+	resolveDialogWaiters(tabId) {
+		const waiters = this.dialogWaiters.get(tabId);
+		if (!waiters) return;
+		this.dialogWaiters.delete(tabId);
+		for (const waiter of waiters) waiter.resolve();
+	}
+	removeDialogWaiter(tabId, waiter) {
+		const waiters = this.dialogWaiters.get(tabId);
+		if (!waiters) return;
+		waiters.delete(waiter);
+		if (waiters.size === 0) this.dialogWaiters.delete(tabId);
+	}
 	async actionPoint(tabId, target) {
 		const source = "nodeToken" in target ? ACTION_POINT_EVALUATE_SOURCE : ACTION_POINT_BY_SELECTOR_SOURCE;
 		const point = await evaluateBiDi(this.client, tabId, source, this.targetArg(target));
@@ -76092,6 +76609,7 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 			type: event.type ?? "alert",
 			...event.defaultValue !== void 0 ? { defaultPrompt: event.defaultValue } : {}
 		});
+		this.resolveDialogWaiters(event.context);
 	}
 	handleBeforeRequestSent(payload) {
 		const event = parseBidiNetworkEvent(payload);
@@ -76194,7 +76712,10 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 			state = {
 				requests: [],
 				byRequestId: /* @__PURE__ */ new Map(),
-				startedAt: /* @__PURE__ */ new Map()
+				startedAt: /* @__PURE__ */ new Map(),
+				hydratedPerformanceResources: false,
+				loadingDone: /* @__PURE__ */ new Map(),
+				bodyRead: /* @__PURE__ */ new Set()
 			};
 			this.pageNetworkStates.set(tabId, state);
 		}
@@ -76210,7 +76731,10 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 		this.pageNetworkStates.set(tabId, {
 			requests: [],
 			byRequestId: /* @__PURE__ */ new Map(),
-			startedAt: /* @__PURE__ */ new Map()
+			startedAt: /* @__PURE__ */ new Map(),
+			hydratedPerformanceResources: false,
+			loadingDone: /* @__PURE__ */ new Map(),
+			bodyRead: /* @__PURE__ */ new Set()
 		});
 		this.pageDialogStates.delete(tabId);
 	}
@@ -76248,6 +76772,36 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 		return `${path.relative(process.cwd(), state.logFile)}${fromLine === state.logLine ? `#L${fromLine}` : `#L${fromLine}-L${state.logLine}`}`;
 	}
 };
+function normalizeFirefoxBidiEndpoint(endpoint, sessionId) {
+	const url = new URL(endpoint);
+	if (sessionId) {
+		url.pathname = `/session/${sessionId}`;
+		return url.toString();
+	}
+	if (url.pathname === "/" || url.pathname === "") url.pathname = "/session";
+	return url.toString();
+}
+async function ensureMcpBiDiSession(client, endpoint, sessionId) {
+	await client.sessionStatus({});
+	if (sessionId || isSessionSpecificFirefoxBidiEndpoint(endpoint)) return false;
+	try {
+		await client.browsingContextGetTree({});
+		return false;
+	} catch (error) {
+		const message = String(error instanceof Error ? error.message : error);
+		if (!message.includes("session does not exist") && !message.includes("invalid session id") && !message.includes("not active")) throw error;
+	}
+	try {
+		await client.sessionNew({ capabilities: { alwaysMatch: { acceptInsecureCerts: true } } });
+		return true;
+	} catch (error) {
+		if (String(error instanceof Error ? error.message : error).includes("Maximum number of active sessions")) throw new Error("Maximum number of active BiDi sessions. Reuse an existing one with sessionId or close the current session first.");
+		throw error;
+	}
+}
+function isSessionSpecificFirefoxBidiEndpoint(endpoint) {
+	return /^\/session\/[^/]+$/.test(new URL(endpoint).pathname);
+}
 async function connectBrowserSession(args) {
 	if (args.protocol === "cdp") return CdpConnectedBrowserSession.connect(args);
 	return BidiConnectedBrowserSession.connect(args);
@@ -76279,7 +76833,7 @@ var McpRuntime = class {
 	constructor(sessionFactory = connectBrowserSession, options = {}) {
 		this.sessionFactory = sessionFactory;
 		this.snapshotMode = options.snapshotMode ?? "full";
-		this.outputDir = configuredOutputDir({ outputDir: options.outputDir });
+		this.outputDir = configuredOutputDir({ ...options.outputDir !== void 0 ? { outputDir: options.outputDir } : {} });
 	}
 	getOutputDir() {
 		return this.outputDir;
@@ -76314,6 +76868,7 @@ var McpRuntime = class {
 		this.invalidateSnapshot();
 		this.pendingFileUploadTarget = void 0;
 		this.tabs = await session.newTab(url);
+		if (this.snapshotMode === "none") return { tabs: this.tabs };
 		const snapshot = this.tabs.some((tab) => tab.active) ? await this.snapshot() : void 0;
 		return snapshot ? {
 			tabs: this.tabs,
@@ -76327,6 +76882,7 @@ var McpRuntime = class {
 		this.invalidateSnapshot();
 		this.pendingFileUploadTarget = void 0;
 		this.tabs = await session.selectTab(tab.id);
+		if (this.snapshotMode === "none") return { tabs: this.tabs };
 		const snapshot = await this.snapshot();
 		return {
 			tabs: this.tabs,
@@ -76340,6 +76896,7 @@ var McpRuntime = class {
 		this.invalidateSnapshot();
 		this.pendingFileUploadTarget = void 0;
 		this.tabs = await session.closeTab(tab.id);
+		if (this.snapshotMode === "none") return { tabs: this.tabs };
 		const snapshot = this.tabs.some((candidate) => candidate.active) ? await this.snapshot() : void 0;
 		return snapshot ? {
 			tabs: this.tabs,
@@ -76348,25 +76905,49 @@ var McpRuntime = class {
 	}
 	async snapshot(args = {}) {
 		const session = this.requireConnected();
-		const activeTab = this.requireActiveTab();
 		const requestKey = this.snapshotRequestKey(args);
 		const request = {
 			...args.boxes !== void 0 ? { boxes: args.boxes } : {},
 			...args.depth !== void 0 ? { depth: args.depth } : {},
 			...args.target ? { target: this.resolveSnapshotTarget(args.target) } : {}
 		};
-		const snapshot = await session.snapshot(request);
+		const { activeTab, currentActiveTab, snapshot } = await this.captureStableSnapshot(session, request);
 		this.snapshotCache = {
-			tabId: activeTab.id,
+			tabId: currentActiveTab.id,
 			requestKey,
 			text: snapshot.text,
 			refs: { ...snapshot.refs },
-			title: snapshot.title,
-			url: snapshot.url,
+			title: currentActiveTab.title || snapshot.title,
+			url: currentActiveTab.url || snapshot.url,
 			...snapshot.console ? { console: { ...snapshot.console } } : {},
 			...snapshot.consoleLink ? { consoleLink: snapshot.consoleLink } : {}
 		};
-		return snapshot;
+		return {
+			...snapshot,
+			title: currentActiveTab.title || snapshot.title,
+			url: currentActiveTab.url || snapshot.url
+		};
+	}
+	async captureStableSnapshot(session, request) {
+		let lastAttempt;
+		for (let attempt = 0; attempt < 4; attempt += 1) {
+			this.tabs = await session.listTabs();
+			const activeTab = this.requireActiveTab();
+			const snapshot = await session.snapshot(request);
+			const refreshedTabs = await session.listTabs();
+			this.tabs = refreshedTabs;
+			const currentActiveTab = refreshedTabs.find((tab) => tab.active) ?? refreshedTabs.find((tab) => tab.id === activeTab.id) ?? activeTab;
+			const captured = {
+				activeTab,
+				currentActiveTab,
+				snapshot
+			};
+			lastAttempt = captured;
+			if (!snapshot.retryable || snapshot.text.trim().length > 0 || currentActiveTab.url === "about:blank") return captured;
+			await delay(150 * (attempt + 1));
+		}
+		if (!lastAttempt) throw new McpToolError("action_failed", "Unable to capture page snapshot.");
+		return lastAttempt;
 	}
 	async click(target, opts) {
 		const session = this.requireConnected();
@@ -76385,6 +76966,7 @@ var McpRuntime = class {
 		this.invalidateSnapshot();
 		this.pendingFileUploadTarget = opensFileChooser ? resolved : void 0;
 		if (this.snapshotMode === "none") return;
+		if (await session.hasDialog()) return;
 		return this.snapshot();
 	}
 	async hover(target) {
@@ -76394,13 +76976,16 @@ var McpRuntime = class {
 		this.invalidateSnapshot();
 		this.pendingFileUploadTarget = void 0;
 		if (this.snapshotMode === "none") return;
+		if (await session.hasDialog()) return;
 		return this.snapshot();
 	}
 	async navigate(url) {
-		await this.requireConnected().navigate(normalizeNavigationUrl(url));
+		const session = this.requireConnected();
+		await session.navigate(normalizeNavigationUrl(url));
 		this.invalidateSnapshot();
 		this.pendingFileUploadTarget = void 0;
 		if (this.snapshotMode === "none") return;
+		if (await session.hasDialog()) return;
 		return this.snapshot();
 	}
 	async type(ref, text, opts) {
@@ -76549,6 +77134,9 @@ var McpRuntime = class {
 	async networkRequest(index) {
 		return this.requireConnected().networkRequest(index);
 	}
+	async fetchResponseBody(index) {
+		return this.requireConnected().fetchResponseBody(index);
+	}
 	async runCodeUnsafe(code) {
 		const result = await this.requireConnected().runCodeUnsafe(code);
 		this.invalidateSnapshot();
@@ -76585,6 +77173,10 @@ var McpRuntime = class {
 	hasPendingFileUploadTarget() {
 		return !!this.pendingFileUploadTarget;
 	}
+	async hasDialog() {
+		if (!this.connection) return false;
+		return this.connection.session.hasDialog();
+	}
 	async close() {
 		this.invalidateSnapshot();
 		this.pendingFileUploadTarget = void 0;
@@ -78205,6 +78797,7 @@ async function createRoxyBrowserMcpInMemory(options = {}) {
 	await bundle.server.connect(serverTransport);
 	return {
 		server: bundle.server,
+		runtimeManager: bundle.runtimeManager,
 		serverTransport,
 		clientTransport,
 		close: async () => {