@gguf/claw 2026.2.9 → 2026.2.13

package/dist/{pw-ai-qEMUq5Mt.js → pw-ai-CKGenizV.js}

@@ -1,7 +1,7 @@
 import "./paths-rb94mUrR.js";
-import "./exec-Bas1hoSJ.js";
+import { at as resolvePreferredOpenClawTmpDir } from "./exec-EKUaAU91.js";
 import { t as formatCliCommand } from "./command-format-CFzL448l.js";
-import { m as getHeadersWithAuth, t as getChromeWebSocketUrl, u as formatAriaSnapshot } from "./chrome-CQd_MVOA.js";
+import { d as normalizeCdpWsUrl, g as withCdpSocket, h as getHeadersWithAuth, m as fetchJson, p as appendCdpPath, t as getChromeWebSocketUrl, u as formatAriaSnapshot } from "./chrome-Bx24uq7B.js";
 import { n as formatErrorMessage } from "./errors-dpUbQseI.js";
 import path from "node:path";
 import fs from "node:fs/promises";
@@ -182,15 +182,17 @@ async function connectBrowser(cdpUrl) {
 				timeout,
 				headers
 			});
+			const onDisconnected = () => {
+				if (cached?.browser === browser) cached = null;
+			};
 			const connected = {
 				browser,
-				cdpUrl: normalized
+				cdpUrl: normalized,
+				onDisconnected
 			};
 			cached = connected;
+			browser.on("disconnected", onDisconnected);
 			observeBrowser(browser);
-			browser.on("disconnected", () => {
-				if (cached?.browser === browser) cached = null;
-			});
 			return connected;
 		} catch (err) {
 			lastErr = err;
@@ -277,9 +279,102 @@ function refLocator(page, ref) {
 async function closePlaywrightBrowserConnection() {
 	const cur = cached;
 	cached = null;
+	connecting = null;
 	if (!cur) return;
+	if (cur.onDisconnected && typeof cur.browser.off === "function") cur.browser.off("disconnected", cur.onDisconnected);
 	await cur.browser.close().catch(() => {});
 }
+function normalizeCdpHttpBaseForJsonEndpoints(cdpUrl) {
+	try {
+		const url = new URL(cdpUrl);
+		if (url.protocol === "ws:") url.protocol = "http:";
+		else if (url.protocol === "wss:") url.protocol = "https:";
+		url.pathname = url.pathname.replace(/\/devtools\/browser\/.*$/, "");
+		url.pathname = url.pathname.replace(/\/cdp$/, "");
+		return url.toString().replace(/\/$/, "");
+	} catch {
+		return cdpUrl.replace(/^ws:/, "http:").replace(/^wss:/, "https:").replace(/\/devtools\/browser\/.*$/, "").replace(/\/cdp$/, "").replace(/\/$/, "");
+	}
+}
+function cdpSocketNeedsAttach(wsUrl) {
+	try {
+		const pathname = new URL(wsUrl).pathname;
+		return pathname === "/cdp" || pathname.endsWith("/cdp") || pathname.includes("/devtools/browser/");
+	} catch {
+		return false;
+	}
+}
+async function tryTerminateExecutionViaCdp(opts) {
+	const cdpHttpBase = normalizeCdpHttpBaseForJsonEndpoints(opts.cdpUrl);
+	const pages = await fetchJson(appendCdpPath(cdpHttpBase, "/json/list"), 2e3).catch(() => null);
+	if (!pages || pages.length === 0) return;
+	const target = pages.find((p) => String(p.id ?? "").trim() === opts.targetId);
+	const wsUrlRaw = String(target?.webSocketDebuggerUrl ?? "").trim();
+	if (!wsUrlRaw) return;
+	const wsUrl = normalizeCdpWsUrl(wsUrlRaw, cdpHttpBase);
+	const needsAttach = cdpSocketNeedsAttach(wsUrl);
+	const runWithTimeout = async (work, ms) => {
+		let timer;
+		const timeoutPromise = new Promise((_, reject) => {
+			timer = setTimeout(() => reject(/* @__PURE__ */ new Error("CDP command timed out")), ms);
+		});
+		try {
+			return await Promise.race([work, timeoutPromise]);
+		} finally {
+			if (timer) clearTimeout(timer);
+		}
+	};
+	await withCdpSocket(wsUrl, async (send) => {
+		let sessionId;
+		try {
+			if (needsAttach) {
+				const attached = await runWithTimeout(send("Target.attachToTarget", {
+					targetId: opts.targetId,
+					flatten: true
+				}), 1500);
+				if (typeof attached?.sessionId === "string" && attached.sessionId.trim()) sessionId = attached.sessionId;
+			}
+			await runWithTimeout(send("Runtime.terminateExecution", void 0, sessionId), 1500);
+			if (sessionId) send("Target.detachFromTarget", { sessionId }).catch(() => {});
+		} catch {}
+	}, { handshakeTimeoutMs: 2e3 }).catch(() => {});
+}
+/**
+* Best-effort cancellation for stuck page operations.
+*
+* Playwright serializes CDP commands per page; a long-running or stuck operation (notably evaluate)
+* can block all subsequent commands. We cannot safely "cancel" an individual command, and we do
+* not want to close the actual Chromium tab. Instead, we disconnect Playwright's CDP connection
+* so in-flight commands fail fast and the next request reconnects transparently.
+*
+* IMPORTANT: We CANNOT call Connection.close() because Playwright shares a single Connection
+* across all objects (BrowserType, Browser, etc.). Closing it corrupts the entire Playwright
+* instance, preventing reconnection.
+*
+* Instead we:
+* 1. Null out `cached` so the next call triggers a fresh connectOverCDP
+* 2. Fire-and-forget browser.close() — it may hang but won't block us
+* 3. The next connectBrowser() creates a completely new CDP WebSocket connection
+*
+* The old browser.close() eventually resolves when the in-browser evaluate timeout fires,
+* or the old connection gets GC'd. Either way, it doesn't affect the fresh connection.
+*/
+async function forceDisconnectPlaywrightForTarget(opts) {
+	const normalized = normalizeCdpUrl(opts.cdpUrl);
+	if (cached?.cdpUrl !== normalized) return;
+	const cur = cached;
+	cached = null;
+	connecting = null;
+	if (cur) {
+		if (cur.onDisconnected && typeof cur.browser.off === "function") cur.browser.off("disconnected", cur.onDisconnected);
+		const targetId = opts.targetId?.trim() || "";
+		if (targetId) await tryTerminateExecutionViaCdp({
+			cdpUrl: normalized,
+			targetId
+		}).catch(() => {});
+		cur.browser.close().catch(() => {});
+	}
+}
 /**
 * List all pages/tabs from the persistent Playwright connection.
 * Used for remote profiles where HTTP-based /json/list is ephemeral.
@@ -714,7 +809,7 @@ function toAIFriendlyError(error, selector) {
 function buildTempDownloadPath(fileName) {
 	const id = crypto.randomUUID();
 	const safeName = fileName.trim() ? fileName.trim() : "download.bin";
-	return path.join("/tmp/openclaw/downloads", `${id}-${safeName}`);
+	return path.join(resolvePreferredOpenClawTmpDir(), "downloads", `${id}-${safeName}`);
 }
 function createPageDownloadWaiter(page, timeoutMs) {
 	let done = false;
@@ -1017,29 +1112,108 @@ async function evaluateViaPlaywright(opts) {
 		targetId: opts.targetId,
 		page
 	});
-	if (opts.ref) {
-		const locator = refLocator(page, opts.ref);
-		const elementEvaluator = new Function("el", "fnBody", `
-      "use strict";
-      try {
-        var candidate = eval("(" + fnBody + ")");
-        return typeof candidate === "function" ? candidate(el) : candidate;
-      } catch (err) {
-        throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
-      }
+	const outerTimeout = normalizeTimeoutMs(opts.timeoutMs, 2e4);
+	let evaluateTimeout = Math.max(1e3, Math.min(12e4, outerTimeout - 500));
+	evaluateTimeout = Math.min(evaluateTimeout, outerTimeout);
+	const signal = opts.signal;
+	let abortListener;
+	let abortReject;
+	let abortPromise;
+	if (signal) {
+		abortPromise = new Promise((_, reject) => {
+			abortReject = reject;
+		});
+		abortPromise.catch(() => {});
+	}
+	if (signal) {
+		const disconnect = () => {
+			forceDisconnectPlaywrightForTarget({
+				cdpUrl: opts.cdpUrl,
+				targetId: opts.targetId,
+				reason: "evaluate aborted"
+			}).catch(() => {});
+		};
+		if (signal.aborted) {
+			disconnect();
+			throw signal.reason ?? /* @__PURE__ */ new Error("aborted");
+		}
+		abortListener = () => {
+			disconnect();
+			abortReject?.(signal.reason ?? /* @__PURE__ */ new Error("aborted"));
+		};
+		signal.addEventListener("abort", abortListener, { once: true });
+		if (signal.aborted) {
+			abortListener();
+			throw signal.reason ?? /* @__PURE__ */ new Error("aborted");
+		}
+	}
+	try {
+		if (opts.ref) {
+			const locator = refLocator(page, opts.ref);
+			const elementEvaluator = new Function("el", "args", `
+        "use strict";
+        var fnBody = args.fnBody, timeoutMs = args.timeoutMs;
+        try {
+          var candidate = eval("(" + fnBody + ")");
+          var result = typeof candidate === "function" ? candidate(el) : candidate;
+          if (result && typeof result.then === "function") {
+            return Promise.race([
+              result,
+              new Promise(function(_, reject) {
+                setTimeout(function() { reject(new Error("evaluate timed out after " + timeoutMs + "ms")); }, timeoutMs);
+              })
+            ]);
+          }
+          return result;
+        } catch (err) {
+          throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
+        }
+        `);
+			const evalPromise = locator.evaluate(elementEvaluator, {
+				fnBody: fnText,
+				timeoutMs: evaluateTimeout
+			});
+			if (!abortPromise) return await evalPromise;
+			try {
+				return await Promise.race([evalPromise, abortPromise]);
+			} catch (err) {
+				evalPromise.catch(() => {});
+				throw err;
+			}
+		}
+		const browserEvaluator = new Function("args", `
+        "use strict";
+        var fnBody = args.fnBody, timeoutMs = args.timeoutMs;
+        try {
+          var candidate = eval("(" + fnBody + ")");
+          var result = typeof candidate === "function" ? candidate() : candidate;
+          if (result && typeof result.then === "function") {
+            return Promise.race([
+              result,
+              new Promise(function(_, reject) {
+                setTimeout(function() { reject(new Error("evaluate timed out after " + timeoutMs + "ms")); }, timeoutMs);
+              })
+            ]);
+          }
+          return result;
+        } catch (err) {
+          throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
+        }
       `);
-		return await locator.evaluate(elementEvaluator, fnText);
+		const evalPromise = page.evaluate(browserEvaluator, {
+			fnBody: fnText,
+			timeoutMs: evaluateTimeout
+		});
+		if (!abortPromise) return await evalPromise;
+		try {
+			return await Promise.race([evalPromise, abortPromise]);
+		} catch (err) {
+			evalPromise.catch(() => {});
+			throw err;
+		}
+	} finally {
+		if (signal && abortListener) signal.removeEventListener("abort", abortListener);
 	}
-	const browserEvaluator = new Function("fnBody", `
-    "use strict";
-    try {
-      var candidate = eval("(" + fnBody + ")");
-      return typeof candidate === "function" ? candidate() : candidate;
-    } catch (err) {
-      throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
-    }
-    `);
-	return await page.evaluate(browserEvaluator, fnText);
 }
 async function scrollIntoViewViaPlaywright(opts) {
 	const page = await getPageForTargetId(opts);
@@ -1647,4 +1821,4 @@ async function traceStopViaPlaywright(opts) {
 }
 
 //#endregion
-export { armDialogViaPlaywright, armFileUploadViaPlaywright, clickViaPlaywright, closePageByTargetIdViaPlaywright, closePageViaPlaywright, closePlaywrightBrowserConnection, cookiesClearViaPlaywright, cookiesGetViaPlaywright, cookiesSetViaPlaywright, createPageViaPlaywright, downloadViaPlaywright, dragViaPlaywright, emulateMediaViaPlaywright, ensurePageState, evaluateViaPlaywright, fillFormViaPlaywright, focusPageByTargetIdViaPlaywright, getConsoleMessagesViaPlaywright, getNetworkRequestsViaPlaywright, getPageErrorsViaPlaywright, getPageForTargetId, highlightViaPlaywright, hoverViaPlaywright, listPagesViaPlaywright, navigateViaPlaywright, pdfViaPlaywright, pressKeyViaPlaywright, refLocator, resizeViewportViaPlaywright, responseBodyViaPlaywright, screenshotWithLabelsViaPlaywright, scrollIntoViewViaPlaywright, selectOptionViaPlaywright, setDeviceViaPlaywright, setExtraHTTPHeadersViaPlaywright, setGeolocationViaPlaywright, setHttpCredentialsViaPlaywright, setInputFilesViaPlaywright, setLocaleViaPlaywright, setOfflineViaPlaywright, setTimezoneViaPlaywright, snapshotAiViaPlaywright, snapshotAriaViaPlaywright, snapshotRoleViaPlaywright, storageClearViaPlaywright, storageGetViaPlaywright, storageSetViaPlaywright, takeScreenshotViaPlaywright, traceStartViaPlaywright, traceStopViaPlaywright, typeViaPlaywright, waitForDownloadViaPlaywright, waitForViaPlaywright };
+export { armDialogViaPlaywright, armFileUploadViaPlaywright, clickViaPlaywright, closePageByTargetIdViaPlaywright, closePageViaPlaywright, closePlaywrightBrowserConnection, cookiesClearViaPlaywright, cookiesGetViaPlaywright, cookiesSetViaPlaywright, createPageViaPlaywright, downloadViaPlaywright, dragViaPlaywright, emulateMediaViaPlaywright, ensurePageState, evaluateViaPlaywright, fillFormViaPlaywright, focusPageByTargetIdViaPlaywright, forceDisconnectPlaywrightForTarget, getConsoleMessagesViaPlaywright, getNetworkRequestsViaPlaywright, getPageErrorsViaPlaywright, getPageForTargetId, highlightViaPlaywright, hoverViaPlaywright, listPagesViaPlaywright, navigateViaPlaywright, pdfViaPlaywright, pressKeyViaPlaywright, refLocator, resizeViewportViaPlaywright, responseBodyViaPlaywright, screenshotWithLabelsViaPlaywright, scrollIntoViewViaPlaywright, selectOptionViaPlaywright, setDeviceViaPlaywright, setExtraHTTPHeadersViaPlaywright, setGeolocationViaPlaywright, setHttpCredentialsViaPlaywright, setInputFilesViaPlaywright, setLocaleViaPlaywright, setOfflineViaPlaywright, setTimezoneViaPlaywright, snapshotAiViaPlaywright, snapshotAriaViaPlaywright, snapshotRoleViaPlaywright, storageClearViaPlaywright, storageGetViaPlaywright, storageSetViaPlaywright, takeScreenshotViaPlaywright, traceStartViaPlaywright, traceStopViaPlaywright, typeViaPlaywright, waitForDownloadViaPlaywright, waitForViaPlaywright };

package/dist/{pw-ai-IOqEXO1O.js → pw-ai-D7devT89.js}

@@ -1,10 +1,10 @@
 import "./paths-DVBShlw6.js";
-import "./subsystem-DPnkvS73.js";
-import "./utils-BTaR--Ln.js";
-import "./exec-DFOtZbI0.js";
+import { W as resolvePreferredOpenClawTmpDir } from "./subsystem-DHfJG4gk.js";
+import "./utils-BtIMES3N.js";
+import "./exec-BPQSKwGa.js";
 import { t as formatCliCommand } from "./command-format-ChfKqObn.js";
-import { _ as formatAriaSnapshot, t as getChromeWebSocketUrl, x as getHeadersWithAuth } from "./chrome-COabMr6f.js";
-import { n as formatErrorMessage } from "./errors-B0eT3jVv.js";
+import { C as withCdpSocket, S as getHeadersWithAuth, _ as formatAriaSnapshot, b as appendCdpPath, t as getChromeWebSocketUrl, v as normalizeCdpWsUrl, x as fetchJson } from "./chrome-BWeMtFGf.js";
+import { n as formatErrorMessage } from "./errors-Bv81hF2P.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 import crypto from "node:crypto";
@@ -184,15 +184,17 @@ async function connectBrowser(cdpUrl) {
 				timeout,
 				headers
 			});
+			const onDisconnected = () => {
+				if (cached?.browser === browser) cached = null;
+			};
 			const connected = {
 				browser,
-				cdpUrl: normalized
+				cdpUrl: normalized,
+				onDisconnected
 			};
 			cached = connected;
+			browser.on("disconnected", onDisconnected);
 			observeBrowser(browser);
-			browser.on("disconnected", () => {
-				if (cached?.browser === browser) cached = null;
-			});
 			return connected;
 		} catch (err) {
 			lastErr = err;
@@ -279,9 +281,102 @@ function refLocator(page, ref) {
 async function closePlaywrightBrowserConnection() {
 	const cur = cached;
 	cached = null;
+	connecting = null;
 	if (!cur) return;
+	if (cur.onDisconnected && typeof cur.browser.off === "function") cur.browser.off("disconnected", cur.onDisconnected);
 	await cur.browser.close().catch(() => {});
 }
+function normalizeCdpHttpBaseForJsonEndpoints(cdpUrl) {
+	try {
+		const url = new URL(cdpUrl);
+		if (url.protocol === "ws:") url.protocol = "http:";
+		else if (url.protocol === "wss:") url.protocol = "https:";
+		url.pathname = url.pathname.replace(/\/devtools\/browser\/.*$/, "");
+		url.pathname = url.pathname.replace(/\/cdp$/, "");
+		return url.toString().replace(/\/$/, "");
+	} catch {
+		return cdpUrl.replace(/^ws:/, "http:").replace(/^wss:/, "https:").replace(/\/devtools\/browser\/.*$/, "").replace(/\/cdp$/, "").replace(/\/$/, "");
+	}
+}
+function cdpSocketNeedsAttach(wsUrl) {
+	try {
+		const pathname = new URL(wsUrl).pathname;
+		return pathname === "/cdp" || pathname.endsWith("/cdp") || pathname.includes("/devtools/browser/");
+	} catch {
+		return false;
+	}
+}
+async function tryTerminateExecutionViaCdp(opts) {
+	const cdpHttpBase = normalizeCdpHttpBaseForJsonEndpoints(opts.cdpUrl);
+	const pages = await fetchJson(appendCdpPath(cdpHttpBase, "/json/list"), 2e3).catch(() => null);
+	if (!pages || pages.length === 0) return;
+	const target = pages.find((p) => String(p.id ?? "").trim() === opts.targetId);
+	const wsUrlRaw = String(target?.webSocketDebuggerUrl ?? "").trim();
+	if (!wsUrlRaw) return;
+	const wsUrl = normalizeCdpWsUrl(wsUrlRaw, cdpHttpBase);
+	const needsAttach = cdpSocketNeedsAttach(wsUrl);
+	const runWithTimeout = async (work, ms) => {
+		let timer;
+		const timeoutPromise = new Promise((_, reject) => {
+			timer = setTimeout(() => reject(/* @__PURE__ */ new Error("CDP command timed out")), ms);
+		});
+		try {
+			return await Promise.race([work, timeoutPromise]);
+		} finally {
+			if (timer) clearTimeout(timer);
+		}
+	};
+	await withCdpSocket(wsUrl, async (send) => {
+		let sessionId;
+		try {
+			if (needsAttach) {
+				const attached = await runWithTimeout(send("Target.attachToTarget", {
+					targetId: opts.targetId,
+					flatten: true
+				}), 1500);
+				if (typeof attached?.sessionId === "string" && attached.sessionId.trim()) sessionId = attached.sessionId;
+			}
+			await runWithTimeout(send("Runtime.terminateExecution", void 0, sessionId), 1500);
+			if (sessionId) send("Target.detachFromTarget", { sessionId }).catch(() => {});
+		} catch {}
+	}, { handshakeTimeoutMs: 2e3 }).catch(() => {});
+}
+/**
+* Best-effort cancellation for stuck page operations.
+*
+* Playwright serializes CDP commands per page; a long-running or stuck operation (notably evaluate)
+* can block all subsequent commands. We cannot safely "cancel" an individual command, and we do
+* not want to close the actual Chromium tab. Instead, we disconnect Playwright's CDP connection
+* so in-flight commands fail fast and the next request reconnects transparently.
+*
+* IMPORTANT: We CANNOT call Connection.close() because Playwright shares a single Connection
+* across all objects (BrowserType, Browser, etc.). Closing it corrupts the entire Playwright
+* instance, preventing reconnection.
+*
+* Instead we:
+* 1. Null out `cached` so the next call triggers a fresh connectOverCDP
+* 2. Fire-and-forget browser.close() — it may hang but won't block us
+* 3. The next connectBrowser() creates a completely new CDP WebSocket connection
+*
+* The old browser.close() eventually resolves when the in-browser evaluate timeout fires,
+* or the old connection gets GC'd. Either way, it doesn't affect the fresh connection.
+*/
+async function forceDisconnectPlaywrightForTarget(opts) {
+	const normalized = normalizeCdpUrl(opts.cdpUrl);
+	if (cached?.cdpUrl !== normalized) return;
+	const cur = cached;
+	cached = null;
+	connecting = null;
+	if (cur) {
+		if (cur.onDisconnected && typeof cur.browser.off === "function") cur.browser.off("disconnected", cur.onDisconnected);
+		const targetId = opts.targetId?.trim() || "";
+		if (targetId) await tryTerminateExecutionViaCdp({
+			cdpUrl: normalized,
+			targetId
+		}).catch(() => {});
+		cur.browser.close().catch(() => {});
+	}
+}
 /**
 * List all pages/tabs from the persistent Playwright connection.
 * Used for remote profiles where HTTP-based /json/list is ephemeral.
@@ -716,7 +811,7 @@ function toAIFriendlyError(error, selector) {
 function buildTempDownloadPath(fileName) {
 	const id = crypto.randomUUID();
 	const safeName = fileName.trim() ? fileName.trim() : "download.bin";
-	return path.join("/tmp/openclaw/downloads", `${id}-${safeName}`);
+	return path.join(resolvePreferredOpenClawTmpDir(), "downloads", `${id}-${safeName}`);
 }
 function createPageDownloadWaiter(page, timeoutMs) {
 	let done = false;
@@ -1019,29 +1114,108 @@ async function evaluateViaPlaywright(opts) {
 		targetId: opts.targetId,
 		page
 	});
-	if (opts.ref) {
-		const locator = refLocator(page, opts.ref);
-		const elementEvaluator = new Function("el", "fnBody", `
-      "use strict";
-      try {
-        var candidate = eval("(" + fnBody + ")");
-        return typeof candidate === "function" ? candidate(el) : candidate;
-      } catch (err) {
-        throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
-      }
+	const outerTimeout = normalizeTimeoutMs(opts.timeoutMs, 2e4);
+	let evaluateTimeout = Math.max(1e3, Math.min(12e4, outerTimeout - 500));
+	evaluateTimeout = Math.min(evaluateTimeout, outerTimeout);
+	const signal = opts.signal;
+	let abortListener;
+	let abortReject;
+	let abortPromise;
+	if (signal) {
+		abortPromise = new Promise((_, reject) => {
+			abortReject = reject;
+		});
+		abortPromise.catch(() => {});
+	}
+	if (signal) {
+		const disconnect = () => {
+			forceDisconnectPlaywrightForTarget({
+				cdpUrl: opts.cdpUrl,
+				targetId: opts.targetId,
+				reason: "evaluate aborted"
+			}).catch(() => {});
+		};
+		if (signal.aborted) {
+			disconnect();
+			throw signal.reason ?? /* @__PURE__ */ new Error("aborted");
+		}
+		abortListener = () => {
+			disconnect();
+			abortReject?.(signal.reason ?? /* @__PURE__ */ new Error("aborted"));
+		};
+		signal.addEventListener("abort", abortListener, { once: true });
+		if (signal.aborted) {
+			abortListener();
+			throw signal.reason ?? /* @__PURE__ */ new Error("aborted");
+		}
+	}
+	try {
+		if (opts.ref) {
+			const locator = refLocator(page, opts.ref);
+			const elementEvaluator = new Function("el", "args", `
+        "use strict";
+        var fnBody = args.fnBody, timeoutMs = args.timeoutMs;
+        try {
+          var candidate = eval("(" + fnBody + ")");
+          var result = typeof candidate === "function" ? candidate(el) : candidate;
+          if (result && typeof result.then === "function") {
+            return Promise.race([
+              result,
+              new Promise(function(_, reject) {
+                setTimeout(function() { reject(new Error("evaluate timed out after " + timeoutMs + "ms")); }, timeoutMs);
+              })
+            ]);
+          }
+          return result;
+        } catch (err) {
+          throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
+        }
+        `);
+			const evalPromise = locator.evaluate(elementEvaluator, {
+				fnBody: fnText,
+				timeoutMs: evaluateTimeout
+			});
+			if (!abortPromise) return await evalPromise;
+			try {
+				return await Promise.race([evalPromise, abortPromise]);
+			} catch (err) {
+				evalPromise.catch(() => {});
+				throw err;
+			}
+		}
+		const browserEvaluator = new Function("args", `
+        "use strict";
+        var fnBody = args.fnBody, timeoutMs = args.timeoutMs;
+        try {
+          var candidate = eval("(" + fnBody + ")");
+          var result = typeof candidate === "function" ? candidate() : candidate;
+          if (result && typeof result.then === "function") {
+            return Promise.race([
+              result,
+              new Promise(function(_, reject) {
+                setTimeout(function() { reject(new Error("evaluate timed out after " + timeoutMs + "ms")); }, timeoutMs);
+              })
+            ]);
+          }
+          return result;
+        } catch (err) {
+          throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
+        }
       `);
-		return await locator.evaluate(elementEvaluator, fnText);
+		const evalPromise = page.evaluate(browserEvaluator, {
+			fnBody: fnText,
+			timeoutMs: evaluateTimeout
+		});
+		if (!abortPromise) return await evalPromise;
+		try {
+			return await Promise.race([evalPromise, abortPromise]);
+		} catch (err) {
+			evalPromise.catch(() => {});
+			throw err;
+		}
+	} finally {
+		if (signal && abortListener) signal.removeEventListener("abort", abortListener);
 	}
-	const browserEvaluator = new Function("fnBody", `
-    "use strict";
-    try {
-      var candidate = eval("(" + fnBody + ")");
-      return typeof candidate === "function" ? candidate() : candidate;
-    } catch (err) {
-      throw new Error("Invalid evaluate function: " + (err && err.message ? err.message : String(err)));
-    }
-    `);
-	return await page.evaluate(browserEvaluator, fnText);
 }
 async function scrollIntoViewViaPlaywright(opts) {
 	const page = await getPageForTargetId(opts);
@@ -1649,4 +1823,4 @@ async function traceStopViaPlaywright(opts) {
 }
 
 //#endregion
-export { armDialogViaPlaywright, armFileUploadViaPlaywright, clickViaPlaywright, closePageByTargetIdViaPlaywright, closePageViaPlaywright, closePlaywrightBrowserConnection, cookiesClearViaPlaywright, cookiesGetViaPlaywright, cookiesSetViaPlaywright, createPageViaPlaywright, downloadViaPlaywright, dragViaPlaywright, emulateMediaViaPlaywright, ensurePageState, evaluateViaPlaywright, fillFormViaPlaywright, focusPageByTargetIdViaPlaywright, getConsoleMessagesViaPlaywright, getNetworkRequestsViaPlaywright, getPageErrorsViaPlaywright, getPageForTargetId, highlightViaPlaywright, hoverViaPlaywright, listPagesViaPlaywright, navigateViaPlaywright, pdfViaPlaywright, pressKeyViaPlaywright, refLocator, resizeViewportViaPlaywright, responseBodyViaPlaywright, screenshotWithLabelsViaPlaywright, scrollIntoViewViaPlaywright, selectOptionViaPlaywright, setDeviceViaPlaywright, setExtraHTTPHeadersViaPlaywright, setGeolocationViaPlaywright, setHttpCredentialsViaPlaywright, setInputFilesViaPlaywright, setLocaleViaPlaywright, setOfflineViaPlaywright, setTimezoneViaPlaywright, snapshotAiViaPlaywright, snapshotAriaViaPlaywright, snapshotRoleViaPlaywright, storageClearViaPlaywright, storageGetViaPlaywright, storageSetViaPlaywright, takeScreenshotViaPlaywright, traceStartViaPlaywright, traceStopViaPlaywright, typeViaPlaywright, waitForDownloadViaPlaywright, waitForViaPlaywright };
+export { armDialogViaPlaywright, armFileUploadViaPlaywright, clickViaPlaywright, closePageByTargetIdViaPlaywright, closePageViaPlaywright, closePlaywrightBrowserConnection, cookiesClearViaPlaywright, cookiesGetViaPlaywright, cookiesSetViaPlaywright, createPageViaPlaywright, downloadViaPlaywright, dragViaPlaywright, emulateMediaViaPlaywright, ensurePageState, evaluateViaPlaywright, fillFormViaPlaywright, focusPageByTargetIdViaPlaywright, forceDisconnectPlaywrightForTarget, getConsoleMessagesViaPlaywright, getNetworkRequestsViaPlaywright, getPageErrorsViaPlaywright, getPageForTargetId, highlightViaPlaywright, hoverViaPlaywright, listPagesViaPlaywright, navigateViaPlaywright, pdfViaPlaywright, pressKeyViaPlaywright, refLocator, resizeViewportViaPlaywright, responseBodyViaPlaywright, screenshotWithLabelsViaPlaywright, scrollIntoViewViaPlaywright, selectOptionViaPlaywright, setDeviceViaPlaywright, setExtraHTTPHeadersViaPlaywright, setGeolocationViaPlaywright, setHttpCredentialsViaPlaywright, setInputFilesViaPlaywright, setLocaleViaPlaywright, setOfflineViaPlaywright, setTimezoneViaPlaywright, snapshotAiViaPlaywright, snapshotAriaViaPlaywright, snapshotRoleViaPlaywright, storageClearViaPlaywright, storageGetViaPlaywright, storageSetViaPlaywright, takeScreenshotViaPlaywright, traceStartViaPlaywright, traceStopViaPlaywright, typeViaPlaywright, waitForDownloadViaPlaywright, waitForViaPlaywright };