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

package/dist/roxybrowser.bundle.js

@@ -16005,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);
@@ -17249,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;
@@ -17645,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 = [];
@@ -73364,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);
@@ -73400,6 +73405,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 +73512,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 +73522,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,
@@ -74666,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)})`;
@@ -74694,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({
@@ -75571,10 +75597,10 @@ 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();
 		return session;
@@ -75619,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)
 		});
@@ -76322,14 +76348,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 +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,
@@ -76427,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,
@@ -76440,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,
@@ -76448,26 +76481,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.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();
@@ -78306,6 +78362,7 @@ async function createRoxyBrowserMcpInMemory(options = {}) {
 	await bundle.server.connect(serverTransport);
 	return {
 		server: bundle.server,
+		runtimeManager: bundle.runtimeManager,
 		serverTransport,
 		clientTransport,
 		close: async () => {