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

package/dist/roxybrowser.bundle.js

@@ -14532,8 +14532,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 +14545,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 +14716,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 +16005,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 +17249,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 +17614,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 +17645,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 = [];
@@ -73280,11 +73304,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,6 +73313,7 @@ var Response$1 = class {
 	results = [];
 	errors = [];
 	code = [];
+	images = [];
 	includeSnapshot = "none";
 	fullSnapshot;
 	isClose = false;
@@ -73311,6 +73331,12 @@ var Response$1 = class {
 	addCode(code) {
 		this.code.push(code);
 	}
+	addImageResult(data, mimeType) {
+		this.images.push({
+			data,
+			mimeType
+		});
+	}
 	setClose() {
 		this.isClose = true;
 	}
@@ -73338,16 +73364,21 @@ var Response$1 = class {
 			sections.push("### Code", "```js", ...this.code, "```");
 		}
 		if (this.includeSnapshot === "full") {
-			const snapshot = await this.context.runtime.snapshot();
+			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.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 +73395,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 +73435,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 +73786,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,13 +73832,301 @@ var keyboard_default$1 = [defineTabTool({
 		});
 	}
 })];
+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}`}');`);
+		}
+	}),
+	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();");
+		}
+	}),
+	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",
+			description: "Wait for text to appear or disappear or a specified time to pass",
+			inputSchema: object({
+				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 (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();
+		}
+	})
+];
+//#endregion
+//#region src/mcp/backend/network.ts
+var requestParts = [
+	"request-headers",
+	"request-body",
+	"response-headers",
+	"response-body"
+];
+var networkRequests = defineTool$1({
+	capability: "core",
+	schema: {
+		name: "browser_network_requests",
+		title: "List network requests",
+		description: "Returns a numbered list of network requests since loading the page. Use browser_network_request with the number to get full details.",
+		inputSchema: object({
+			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 (context, args, response) => {
+		const requests = await context.runtime.networkRequests();
+		const filter = args.filter ? new RegExp(args.filter) : void 0;
+		const lines = [];
+		let hiddenStaticCount = 0;
+		for (const request of requests) {
+			if (!args.static && !isFetch(request) && isSuccessfulResponse(request)) {
+				hiddenStaticCount++;
+				continue;
+			}
+			if (filter && !filter.test(request.url)) continue;
+			lines.push(`${request.index}. ${renderRequestLine(request)}`);
+		}
+		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 context.resolveOutputFile(args.filename);
+			await writeFile(resolvedFilename, text);
+			response.addTextResult(`Saved network requests to "${resolvedFilename}".`);
+			return;
+		}
+		response.addTextResult(text);
+	}
+});
+var networkRequest = defineTool$1({
+	capability: "core",
+	schema: {
+		name: "browser_network_request",
+		title: "Show network request details",
+		description: "Returns full details (headers and body) of a single network request, or a single part if part is set. Use the number from browser_network_requests.",
+		inputSchema: object({
+			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 (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;
+		}
+		const text = args.part ? renderRequestPart(request, args.part) : renderRequestDetails(request);
+		if (args.filename) {
+			const resolvedFilename = await context.resolveOutputFile(args.filename);
+			await writeFile(resolvedFilename, text);
+			response.addTextResult(`Saved network request to "${resolvedFilename}".`);
+			return;
+		}
+		response.addTextResult(text);
+	}
+});
+function isSuccessfulResponse(request) {
+	return !request.failureText && request.status !== void 0 && request.status < 400;
+}
+function isFetch(request) {
+	return request.resourceType === "fetch" || request.resourceType === "xhr";
+}
+function renderRequestLine(request) {
+	let line = `[${request.method.toUpperCase()}] ${request.url}`;
+	if (request.status !== void 0) line += ` => [${request.status}] ${request.statusText ?? ""}`.trimEnd();
+	else if (request.failureText) line += ` => [FAILED] ${request.failureText}`;
+	return line;
+}
+function renderRequestDetails(request) {
+	const lines = [];
+	lines.push(`#${request.index} [${request.method.toUpperCase()}] ${request.url}`);
+	lines.push("");
+	lines.push("  General");
+	if (request.status !== void 0) lines.push(`    status:    [${request.status}] ${request.statusText ?? ""}`.trimEnd());
+	else if (request.failureText) lines.push(`    status:    [FAILED] ${request.failureText}`);
+	if (request.durationMs !== void 0) lines.push(`    duration:  ${request.durationMs}ms`);
+	lines.push(`    type:      ${request.resourceType}`);
+	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.`);
+	return lines.join("\n");
+}
+function renderRequestPart(request, part) {
+	if (part === "request-headers") return renderHeaders(request.requestHeaders);
+	if (part === "request-body") return request.requestBody ?? "";
+	if (part === "response-headers") return renderHeaders(request.responseHeaders ?? {});
+	return request.responseBody ?? "";
+}
+function appendHeaders(lines, title, headers) {
+	const entries = Object.entries(headers);
+	if (!entries.length) return;
+	lines.push("");
+	lines.push(`  ${title}`);
+	for (const [key, value] of entries) lines.push(`    ${key}: ${value}`);
+}
+function renderHeaders(headers) {
+	return Object.entries(headers).map(([key, value]) => `${key}: ${value}`).join("\n");
+}
+var network_default = [networkRequests, networkRequest];
+var runCode_default = [defineTool$1({
+	capability: "devtools",
+	schema: {
+		name: "browser_run_code_unsafe",
+		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({
+			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 (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/backend/tools.ts
 var browserTools = [
-	...common_default$1,
+	...common_default,
+	...console_default,
+	...connect_default,
+	...dialogs_default,
+	...evaluate_default,
 	...files_default,
-	...keyboard_default$1,
-	...snapshot_default
+	...keyboard_default,
+	...navigate_default,
+	...network_default,
+	...runCode_default,
+	...screenshot_default,
+	...snapshot_default,
+	...tabs_default
 ];
 //#endregion
 //#region src/mcp/errors.ts
@@ -73683,135 +74155,6 @@ function textResult(text, isError = false) {
 		...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));
-		}
-		if (args.action === "select") {
-			const result = await runtime.selectTab(args.index);
-			return textResult(formatTabsWithOptionalSnapshot(result.tabs, result.snapshot));
-		}
-		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({
-		schema: {
-			name: "browser_wait_for",
-			title: "Wait for",
-			description: "Wait for text to appear or disappear or a specified time to pass",
-			inputSchema: object({
-				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")
-			})
-		},
-		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)));
-		}
-	})
-];
 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")
@@ -73848,17 +74191,6 @@ object({
 	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")
@@ -73909,254 +74241,9 @@ var form_default = [defineTool({
 		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
-var requestParts = [
-	"request-headers",
-	"request-body",
-	"response-headers",
-	"response-body"
-];
-var networkRequests = defineTool({
-	schema: {
-		name: "browser_network_requests",
-		title: "List network requests",
-		description: "Returns a numbered list of network requests since loading the page. Use browser_network_request with the number to get full details.",
-		inputSchema: object({
-			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.")
-		})
-	},
-	handle: async (args, runtime) => {
-		const requests = await runtime.networkRequests();
-		const filter = args.filter ? new RegExp(args.filter) : void 0;
-		const lines = [];
-		let hiddenStaticCount = 0;
-		for (const request of requests) {
-			if (!args.static && !isFetch(request) && isSuccessfulResponse(request)) {
-				hiddenStaticCount++;
-				continue;
-			}
-			if (filter && !filter.test(request.url)) continue;
-			lines.push(`${request.index}. ${renderRequestLine(request)}`);
-		}
-		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() });
-			await writeFile(resolvedFilename, text);
-			return textResult(`Saved network requests to "${resolvedFilename}".`);
-		}
-		return textResult(text);
-	}
-});
-var networkRequest = defineTool({
-	schema: {
-		name: "browser_network_request",
-		title: "Show network request details",
-		description: "Returns full details (headers and body) of a single network request, or a single part if part is set. Use the number from browser_network_requests.",
-		inputSchema: object({
-			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.")
-		})
-	},
-	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);
-		if (args.filename) {
-			const resolvedFilename = await resolveOutputFilePath(args.filename, { outputDir: runtime.getOutputDir() });
-			await writeFile(resolvedFilename, text);
-			return textResult(`Saved network request to "${resolvedFilename}".`);
-		}
-		return textResult(text);
-	}
-});
-function isSuccessfulResponse(request) {
-	return !request.failureText && request.status !== void 0 && request.status < 400;
-}
-function isFetch(request) {
-	return request.resourceType === "fetch" || request.resourceType === "xhr";
-}
-function renderRequestLine(request) {
-	let line = `[${request.method.toUpperCase()}] ${request.url}`;
-	if (request.status !== void 0) line += ` => [${request.status}] ${request.statusText ?? ""}`.trimEnd();
-	else if (request.failureText) line += ` => [FAILED] ${request.failureText}`;
-	return line;
-}
-function renderRequestDetails(request) {
-	const lines = [];
-	lines.push(`#${request.index} [${request.method.toUpperCase()}] ${request.url}`);
-	lines.push("");
-	lines.push("  General");
-	if (request.status !== void 0) lines.push(`    status:    [${request.status}] ${request.statusText ?? ""}`.trimEnd());
-	else if (request.failureText) lines.push(`    status:    [FAILED] ${request.failureText}`);
-	if (request.durationMs !== void 0) lines.push(`    duration:  ${request.durationMs}ms`);
-	lines.push(`    type:      ${request.resourceType}`);
-	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.`);
-	return lines.join("\n");
-}
-function renderRequestPart(request, part) {
-	if (part === "request-headers") return renderHeaders(request.requestHeaders);
-	if (part === "request-body") return request.requestBody ?? "";
-	if (part === "response-headers") return renderHeaders(request.responseHeaders ?? {});
-	return request.responseBody ?? "";
-}
-function appendHeaders(lines, title, headers) {
-	const entries = Object.entries(headers);
-	if (!entries.length) return;
-	lines.push("");
-	lines.push(`  ${title}`);
-	for (const [key, value] of entries) lines.push(`    ${key}: ${value}`);
-}
-function renderHeaders(headers) {
-	return Object.entries(headers).map(([key, value]) => `${key}: ${value}`).join("\n");
-}
-var network_default = [networkRequests, networkRequest];
-var runCode_default = [defineTool({
-	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.",
-		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.")
-		})
-	},
-	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");
-	}
-})];
 //#endregion
 //#region src/mcp/tools/index.ts
-var allTools = [
-	...connect_default,
-	...common_default,
-	...tabs_default,
-	...navigate_default,
-	...mouse_default,
-	...keyboard_default,
-	...form_default,
-	...screenshot_default,
-	...console_default,
-	...evaluate_default,
-	...dialog_default,
-	...network_default,
-	...runCode_default
-];
+var allTools = [...mouse_default, ...form_default];
 //#endregion
 //#region src/mcp/connectedBrowser.ts
 function delay$1(ms) {
@@ -74595,13 +74682,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 +74710,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({
@@ -75490,6 +75587,7 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 	bidiListeners = /* @__PURE__ */ new Map();
 	responseDataCollector;
 	activeTabId;
+	ownsSession = false;
 	constructor(client) {
 		this.client = client;
 	}
@@ -75497,10 +75595,12 @@ 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();
 		return session;
@@ -75545,7 +75645,7 @@ 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, {
+		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)
 		});
@@ -75747,7 +75847,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) {
@@ -76248,6 +76348,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 +76409,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 +76444,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 +76458,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 +76472,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 +76481,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.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();
@@ -78205,6 +78362,7 @@ async function createRoxyBrowserMcpInMemory(options = {}) {
 	await bundle.server.connect(serverTransport);
 	return {
 		server: bundle.server,
+		runtimeManager: bundle.runtimeManager,
 		serverTransport,
 		clientTransport,
 		close: async () => {