@roxybrowser/playwright 2.0.2-beta.1 → 2.0.2-beta.4

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);
@@ -16005,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);
@@ -17249,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;
@@ -17645,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 = [];
@@ -53334,7 +53444,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", {
@@ -73317,6 +73429,7 @@ var Response$1 = class {
 	includeSnapshot = "none";
 	fullSnapshot;
 	isClose = false;
+	rawResults = false;
 	constructor(context, toolName, toolArgs) {
 		this.context = context;
 		this.toolName = toolName;
@@ -73340,6 +73453,9 @@ var Response$1 = class {
 	setClose() {
 		this.isClose = true;
 	}
+	setRawResults() {
+		this.rawResults = true;
+	}
 	setIncludeSnapshot() {
 		this.includeSnapshot = this.context.config.snapshot?.mode ?? "full";
 	}
@@ -73355,6 +73471,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);
@@ -73364,16 +73495,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);
@@ -73400,6 +73538,15 @@ var Response$1 = class {
 		};
 	}
 };
+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) {
@@ -73498,7 +73645,8 @@ var connect_default = [defineTool$1({
 		description: "Attach to an existing browser and seed the active tab snapshot.",
 		inputSchema: object({
 			endpoint: string().min(1),
-			browser: _enum(["chrome", "firefox"]).default("chrome")
+			browser: _enum(["chrome", "firefox"]).default("chrome"),
+			sessionId: string().min(1).optional()
 		}),
 		type: "action"
 	},
@@ -73507,7 +73655,8 @@ var connect_default = [defineTool$1({
 		const result = await context.runtime.connect({
 			protocol,
 			endpoint: params.endpoint,
-			browser: params.browser === "chrome" ? "chromium" : params.browser
+			browser: params.browser === "chrome" ? "chromium" : params.browser,
+			...params.sessionId ? { sessionId: params.sessionId } : {}
 		});
 		response.addTextResult(formatConnectResult({
 			...result,
@@ -73952,7 +74101,17 @@ var networkRequest = defineTool$1({
 			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.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 context.resolveOutputFile(args.filename);
 			await writeFile(resolvedFilename, text);
@@ -73986,8 +74145,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) {
@@ -74006,6 +74167,10 @@ 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$1({
 	capability: "devtools",
@@ -74666,13 +74831,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)})`;
@@ -74694,6 +74859,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({
@@ -74733,6 +74908,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) {
@@ -74748,7 +74924,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;
 	}
@@ -74800,6 +74976,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;
@@ -74833,7 +75010,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,
@@ -74841,6 +75018,7 @@ var CdpConnectedBrowserSession = class CdpConnectedBrowserSession {
 				clickCount,
 				modifiers: modifiersMask
 			});
+			await Promise.race([releasePromise, this.waitForDialog(tabId, options.clickHoldMs + 1e3)]);
 		}
 	}
 	async drag(start, end, options) {
@@ -75096,24 +75274,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);
@@ -75173,6 +75399,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.");
@@ -75254,6 +75486,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);
 	}
@@ -75292,20 +75525,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) {
@@ -75327,7 +75569,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);
 		}
@@ -75343,10 +75588,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;
@@ -75480,6 +75794,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,
@@ -75558,6 +75911,7 @@ 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;
@@ -75571,12 +75925,12 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 		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 client = await getBidiClientFactory()({
 			browserName: "firefox",
-			webSocketUrl: normalizeFirefoxBidiEndpoint(args.endpoint)
+			webSocketUrl: normalizeFirefoxBidiEndpoint(args.endpoint, args.sessionId)
 		});
 		const session = new BidiConnectedBrowserSession(client);
-		session.ownsSession = await ensureMcpBiDiSession(client, args.endpoint);
+		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() {
@@ -75619,10 +75973,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();
@@ -76029,7 +76386,7 @@ 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({
@@ -76038,6 +76395,9 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 			...promptText !== void 0 ? { userText: promptText } : {}
 		});
 	}
+	async hasDialog() {
+		return this.pageDialogStates.size > 0;
+	}
 	async networkRequests() {
 		const tabId = await this.getActiveTabId();
 		return this.ensureNetworkState(tabId).requests.map(cloneNetworkRequest);
@@ -76047,6 +76407,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})`)});
@@ -76110,6 +76479,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));
@@ -76268,7 +76676,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);
 		}
@@ -76284,7 +76695,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);
 	}
@@ -76322,14 +76736,18 @@ var BidiConnectedBrowserSession = class BidiConnectedBrowserSession {
 		return `${path.relative(process.cwd(), state.logFile)}${fromLine === state.logLine ? `#L${fromLine}` : `#L${fromLine}-L${state.logLine}`}`;
 	}
 };
-function normalizeFirefoxBidiEndpoint(endpoint) {
+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) {
+async function ensureMcpBiDiSession(client, endpoint, sessionId) {
 	await client.sessionStatus({});
-	if (isSessionSpecificFirefoxBidiEndpoint(endpoint)) return false;
+	if (sessionId || isSessionSpecificFirefoxBidiEndpoint(endpoint)) return false;
 	try {
 		await client.browsingContextGetTree({});
 		return false;
@@ -76414,6 +76832,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,
@@ -76427,6 +76846,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,
@@ -76440,6 +76860,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,
@@ -76448,26 +76869,49 @@ var McpRuntime = class {
 	}
 	async snapshot(args = {}) {
 		const session = this.requireConnected();
-		this.tabs = await session.listTabs();
-		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();
@@ -76486,6 +76930,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) {
@@ -76495,13 +76940,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) {
@@ -76650,6 +77098,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();
@@ -76686,6 +77137,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;
@@ -78306,6 +78761,7 @@ async function createRoxyBrowserMcpInMemory(options = {}) {
 	await bundle.server.connect(serverTransport);
 	return {
 		server: bundle.server,
+		runtimeManager: bundle.runtimeManager,
 		serverTransport,
 		clientTransport,
 		close: async () => {