@pyrokine/mcp-chrome 2.4.0 → 2.4.1

package/extension/dist/assets/{index.ts-BMmrcSQ6.js → index.ts-GG6dPUPX.js}

@@ -15,6 +15,272 @@ function isExpectedOperationError(err) {
 	return err instanceof ExpectedOperationError;
 }
 //#endregion
+//#region src/background/tab-state.ts
+/**
+* Managed tab/window 状态与 storage 恢复。
+*/
+var STORAGE_KEY = "mcp_managed_tab_ids";
+var mcpTabGroupId = null;
+var mcpWindowId = null;
+var managedTabIds = /* @__PURE__ */ new Set();
+function getMcpTabGroupId() {
+	return mcpTabGroupId;
+}
+function getMcpWindowId() {
+	return mcpWindowId;
+}
+function setMcpTabGroupId(groupId) {
+	mcpTabGroupId = groupId;
+}
+function setMcpWindowId(windowId) {
+	mcpWindowId = windowId;
+}
+async function markManagedTab(tabId) {
+	managedTabIds.add(tabId);
+	await chrome.storage.local.set({ [STORAGE_KEY]: [...managedTabIds] });
+}
+async function unmarkManagedTab(tabId) {
+	managedTabIds.delete(tabId);
+	await chrome.storage.local.set({ [STORAGE_KEY]: [...managedTabIds] });
+}
+function isManagedTab(tab, context) {
+	if (tab.id !== void 0 && managedTabIds.has(tab.id)) return true;
+	return context.mcpTabGroupId !== null && tab.groupId === context.mcpTabGroupId;
+}
+/** Extension 启动时调用，从 storage 恢复 managed tab 集合 */
+async function restoreManagedTabs() {
+	const result = await chrome.storage.local.get(STORAGE_KEY);
+	const stored = Array.isArray(result[STORAGE_KEY]) ? result[STORAGE_KEY] : [];
+	for (const id of stored) managedTabIds.add(id);
+	const tabs = await chrome.tabs.query({});
+	const existingIds = new Set(tabs.map((t) => t.id).filter((id) => id !== void 0));
+	for (const id of managedTabIds) if (!existingIds.has(id)) managedTabIds.delete(id);
+	await chrome.storage.local.set({ [STORAGE_KEY]: [...managedTabIds] });
+}
+//#endregion
+//#region src/background/action-utils.ts
+function isRestrictedUrl(url) {
+	if (!url) return true;
+	return url === "about:blank" || url.startsWith("about:") || url.startsWith("chrome://") || url.startsWith("chrome-extension://");
+}
+async function assertScriptable(tabId) {
+	const tab = await chrome.tabs.get(tabId);
+	if (isRestrictedUrl(tab.url)) throw new ExpectedOperationError(`Cannot execute on restricted URL "${tab.url}". Navigate to an http/https page first.`);
+}
+async function getTargetTabId(tabId) {
+	if (tabId !== void 0 && tabId !== null) {
+		try {
+			await chrome.tabs.get(tabId);
+		} catch {
+			throw new ExpectedOperationError(`Tab ${tabId} 不存在（可能已被关闭）`);
+		}
+		return tabId;
+	}
+	const [activeTab] = await chrome.tabs.query({
+		active: true,
+		currentWindow: true
+	});
+	if (!activeTab?.id) throw new ExpectedOperationError("No active tab found");
+	return activeTab.id;
+}
+function tabToInfo(tab, context) {
+	return {
+		id: tab.id,
+		url: tab.url || "",
+		title: tab.title || "",
+		active: tab.active,
+		windowId: tab.windowId,
+		index: tab.index,
+		groupId: tab.groupId,
+		pinned: tab.pinned,
+		incognito: tab.incognito,
+		managed: isManagedTab(tab, context),
+		status: tab.status || "unknown"
+	};
+}
+async function assertManagedTab(tabId, context, operation) {
+	let tab;
+	try {
+		tab = await chrome.tabs.get(tabId);
+	} catch {
+		throw new ExpectedOperationError(`Tab ${tabId} 不存在（可能已被关闭）`);
+	}
+	if (!isManagedTab(tab, context)) throw new ExpectedOperationError(`${operation} 拒绝操作非托管 tab, ${JSON.stringify({
+		tabId,
+		managed: false,
+		groupId: tab.groupId,
+		mcpTabGroupId: context.mcpTabGroupId,
+		windowId: tab.windowId,
+		mcpWindowId: context.mcpWindowId
+	})}, 请使用 browse(action="list") 选择 managed=true 的受控 tab, 或用 manage(action="newPage") 创建受控页面`);
+	return tab;
+}
+var FRAME_PROBE_TIMEOUT_MS = 500;
+var pendingDomFrameProbes = /* @__PURE__ */ new Map();
+function recordDomFrameProbe(message, sender) {
+	const pending = pendingDomFrameProbes.get(message.token);
+	if (!pending || sender.tab?.id !== pending.tabId || sender.frameId === void 0 || sender.frameId === 0 || !Number.isInteger(message.index) || message.index < 0) return { accepted: false };
+	const frameIds = pending.frameIdsByIndex.get(message.index) ?? [];
+	if (!frameIds.includes(sender.frameId)) {
+		frameIds.push(sender.frameId);
+		pending.frameIdsByIndex.set(message.index, frameIds);
+	}
+	return { accepted: true };
+}
+/**
+* 将父文档里的 DOM iframe 与 Chrome frameId 建立可验证映射
+*
+* webNavigation 可能包含页面 DOM 不可见的其他 Extension frame，因此不能按两个列表的顺序配对
+* 这里向每个 DOM iframe 的 contentWindow 发送一次随机 probe，再从对应 content script 的 sender 读取实际 frameId
+*/
+async function getDomFrameSnapshot(tabId, parentFrameId, selection) {
+	const token = crypto.randomUUID();
+	const pendingProbe = {
+		tabId,
+		frameIdsByIndex: /* @__PURE__ */ new Map()
+	};
+	pendingDomFrameProbes.set(token, pendingProbe);
+	try {
+		const parentResult = (await chrome.scripting.executeScript({
+			target: {
+				tabId,
+				frameIds: [parentFrameId]
+			},
+			func: async (probeToken, requestedSelection, timeoutMs) => {
+				const iframes = Array.from(document.querySelectorAll("iframe, frame"));
+				let selectedIndex = null;
+				let selectionStatus = "not-requested";
+				let selectionError;
+				if (typeof requestedSelection === "number") if (requestedSelection < 0 || requestedSelection >= iframes.length) selectionStatus = "out-of-range";
+				else {
+					selectedIndex = requestedSelection;
+					selectionStatus = "found";
+				}
+				else if (typeof requestedSelection === "string") try {
+					const selected = document.querySelector(requestedSelection);
+					if (!selected) selectionStatus = "not-found";
+					else if (!selected.matches("iframe, frame")) selectionStatus = "not-frame";
+					else {
+						selectedIndex = iframes.indexOf(selected);
+						selectionStatus = selectedIndex >= 0 ? "found" : "not-found";
+					}
+				} catch (error) {
+					selectionStatus = "invalid-selector";
+					selectionError = (error instanceof Error ? error.message : String(error)).slice(0, 300);
+				}
+				const acknowledged = await Promise.all(iframes.map((frame, index) => new Promise((resolve) => {
+					const child = frame.contentWindow;
+					if (!child) {
+						resolve(false);
+						return;
+					}
+					let settled = false;
+					const finish = (value) => {
+						if (settled) return;
+						settled = true;
+						window.clearTimeout(timer);
+						window.removeEventListener("message", onMessage);
+						resolve(value);
+					};
+					const onMessage = (event) => {
+						const data = event.data;
+						if (event.source === child && data?.type === "mcp-frame-probe-ack" && data.token === probeToken && data.index === index) finish(true);
+					};
+					const timer = window.setTimeout(() => finish(false), timeoutMs);
+					window.addEventListener("message", onMessage);
+					child.postMessage({
+						type: "mcp-frame-probe",
+						token: probeToken,
+						index
+					}, "*");
+				})));
+				return {
+					parent: {
+						title: document.title || null,
+						rect: {
+							x: 0,
+							y: 0,
+							width: window.innerWidth,
+							height: window.innerHeight
+						}
+					},
+					frames: iframes.map((frame, index) => {
+						const rect = frame.getBoundingClientRect();
+						return {
+							index,
+							acknowledged: acknowledged[index],
+							url: frame.src || "",
+							title: frame.title || null,
+							name: frame.name || null,
+							selector: frame.id ? `#${CSS.escape(frame.id)}` : `${frame.tagName.toLowerCase()}:nth-of-type(${index + 1})`,
+							rect: {
+								x: rect.x,
+								y: rect.y,
+								width: rect.width,
+								height: rect.height
+							},
+							contentOffset: {
+								x: rect.x + frame.clientLeft,
+								y: rect.y + frame.clientTop
+							}
+						};
+					}),
+					selectedIndex,
+					selectionStatus,
+					selectionError
+				};
+			},
+			args: [
+				token,
+				selection ?? null,
+				FRAME_PROBE_TIMEOUT_MS
+			]
+		}))[0]?.result;
+		if (!parentResult) throw new ExpectedOperationError(`无法读取 parent frame ${parentFrameId} 的 iframe DOM`);
+		return {
+			parent: parentResult.parent,
+			frames: parentResult.frames.map(({ acknowledged, ...frame }) => {
+				const candidateFrameIds = acknowledged ? pendingProbe.frameIdsByIndex.get(frame.index) ?? [] : [];
+				return {
+					...frame,
+					frameId: candidateFrameIds.length === 1 ? candidateFrameIds[0] : null,
+					candidateFrameIds: candidateFrameIds.slice(0, 10)
+				};
+			}),
+			selectedIndex: parentResult.selectedIndex,
+			selectionStatus: parentResult.selectionStatus,
+			...parentResult.selectionError ? { selectionError: parentResult.selectionError } : {}
+		};
+	} finally {
+		pendingDomFrameProbes.delete(token);
+	}
+}
+/**
+* 递归计算 iframe 在页面坐标系中的偏移量
+*
+* 对于嵌套 iframe，递归累加各层偏移，clientLeft/clientTop 补偿 iframe border
+*/
+async function getFrameOffset(tabId, frameId) {
+	const targetFrame = (await chrome.webNavigation.getAllFrames({ tabId }))?.find((frame) => frame.frameId === frameId);
+	if (!targetFrame || targetFrame.parentFrameId === -1) return null;
+	if (isRestrictedUrl((await chrome.tabs.get(tabId)).url)) return null;
+	let parentOffset = {
+		x: 0,
+		y: 0
+	};
+	if (targetFrame.parentFrameId !== 0) {
+		const resolvedParentOffset = await getFrameOffset(tabId, targetFrame.parentFrameId);
+		if (!resolvedParentOffset) return null;
+		parentOffset = resolvedParentOffset;
+	}
+	const mappedFrame = (await getDomFrameSnapshot(tabId, targetFrame.parentFrameId)).frames.find((frame) => frame.frameId === frameId);
+	if (!mappedFrame) return null;
+	return {
+		x: parentOffset.x + mappedFrame.contentOffset.x,
+		y: parentOffset.y + mappedFrame.contentOffset.y
+	};
+}
+//#endregion
 //#region node_modules/zod/v4/core/core.js
 var _a$1;
 function $constructor(name, initializer, params) {
@@ -4567,172 +4833,10 @@ var EvaluateInFrameSchema = object({
 	tabId: tabIdOpt,
 	frameId: number().int().nonnegative(),
 	expression: string().min(1),
-	timeout: number().nonnegative().optional()
+	timeout: number().nonnegative().optional(),
+	staleContextRetry: _enum(["never", "readOnly"]).default("never")
 });
 //#endregion
-//#region src/background/tab-state.ts
-/**
-* Managed tab/window 状态与 storage 恢复。
-*/
-var STORAGE_KEY = "mcp_managed_tab_ids";
-var mcpTabGroupId = null;
-var mcpWindowId = null;
-var managedTabIds = /* @__PURE__ */ new Set();
-function getMcpTabGroupId() {
-	return mcpTabGroupId;
-}
-function getMcpWindowId() {
-	return mcpWindowId;
-}
-function setMcpTabGroupId(groupId) {
-	mcpTabGroupId = groupId;
-}
-function setMcpWindowId(windowId) {
-	mcpWindowId = windowId;
-}
-async function markManagedTab(tabId) {
-	managedTabIds.add(tabId);
-	await chrome.storage.local.set({ [STORAGE_KEY]: [...managedTabIds] });
-}
-async function unmarkManagedTab(tabId) {
-	managedTabIds.delete(tabId);
-	await chrome.storage.local.set({ [STORAGE_KEY]: [...managedTabIds] });
-}
-function isManagedTab(tab, context) {
-	if (tab.id !== void 0 && managedTabIds.has(tab.id)) return true;
-	return context.mcpTabGroupId !== null && tab.groupId === context.mcpTabGroupId;
-}
-/** Extension 启动时调用，从 storage 恢复 managed tab 集合 */
-async function restoreManagedTabs() {
-	const result = await chrome.storage.local.get(STORAGE_KEY);
-	const stored = Array.isArray(result[STORAGE_KEY]) ? result[STORAGE_KEY] : [];
-	for (const id of stored) managedTabIds.add(id);
-	const tabs = await chrome.tabs.query({});
-	const existingIds = new Set(tabs.map((t) => t.id).filter((id) => id !== void 0));
-	for (const id of managedTabIds) if (!existingIds.has(id)) managedTabIds.delete(id);
-	await chrome.storage.local.set({ [STORAGE_KEY]: [...managedTabIds] });
-}
-//#endregion
-//#region src/background/action-utils.ts
-/**
-* Action 处理器共享工具函数
-*
-* 纯工具函数，不依赖任何实例状态，可被多个 handler 模块直接 import 使用
-*/
-function isRestrictedUrl(url) {
-	if (!url) return true;
-	return url === "about:blank" || url.startsWith("about:") || url.startsWith("chrome://") || url.startsWith("chrome-extension://");
-}
-async function assertScriptable(tabId) {
-	const tab = await chrome.tabs.get(tabId);
-	if (isRestrictedUrl(tab.url)) throw new ExpectedOperationError(`Cannot execute on restricted URL "${tab.url}". Navigate to an http/https page first.`);
-}
-async function getTargetTabId(tabId) {
-	if (tabId !== void 0 && tabId !== null) {
-		try {
-			await chrome.tabs.get(tabId);
-		} catch {
-			throw new ExpectedOperationError(`Tab ${tabId} 不存在（可能已被关闭）`);
-		}
-		return tabId;
-	}
-	const [activeTab] = await chrome.tabs.query({
-		active: true,
-		currentWindow: true
-	});
-	if (!activeTab?.id) throw new ExpectedOperationError("No active tab found");
-	return activeTab.id;
-}
-function tabToInfo(tab, context) {
-	return {
-		id: tab.id,
-		url: tab.url || "",
-		title: tab.title || "",
-		active: tab.active,
-		windowId: tab.windowId,
-		index: tab.index,
-		groupId: tab.groupId,
-		pinned: tab.pinned,
-		incognito: tab.incognito,
-		managed: isManagedTab(tab, context),
-		status: tab.status || "unknown"
-	};
-}
-async function assertManagedTab(tabId, context, operation) {
-	let tab;
-	try {
-		tab = await chrome.tabs.get(tabId);
-	} catch {
-		throw new ExpectedOperationError(`Tab ${tabId} 不存在（可能已被关闭）`);
-	}
-	if (!isManagedTab(tab, context)) throw new ExpectedOperationError(`${operation} 拒绝操作非托管 tab, ${JSON.stringify({
-		tabId,
-		managed: false,
-		groupId: tab.groupId,
-		mcpTabGroupId: context.mcpTabGroupId,
-		windowId: tab.windowId,
-		mcpWindowId: context.mcpWindowId
-	})}, 请使用 browse(action="list") 选择 managed=true 的受控 tab, 或用 manage(action="newPage") 创建受控页面`);
-	return tab;
-}
-/**
-* 递归计算 iframe 在页面坐标系中的偏移量
-*
-* 对于嵌套 iframe，递归累加各层偏移，
-* 当多个 iframe 共享同一 URL 时，优先按同 URL 的出现顺序匹配，
-* clientLeft/clientTop 补偿 iframe 的 border，确保坐标指向内容区域起点
-*/
-async function getFrameOffset(tabId, frameId) {
-	const allFrames = await chrome.webNavigation.getAllFrames({ tabId });
-	if (!allFrames) return null;
-	const targetFrame = allFrames.find((f) => f.frameId === frameId);
-	if (!targetFrame || targetFrame.parentFrameId === -1) return null;
-	if (isRestrictedUrl((await chrome.tabs.get(tabId)).url)) return null;
-	let parentOffset = {
-		x: 0,
-		y: 0
-	};
-	if (targetFrame.parentFrameId !== 0) {
-		const po = await getFrameOffset(tabId, targetFrame.parentFrameId);
-		if (po) parentOffset = po;
-	}
-	const siblingFrames = allFrames.filter((f) => f.parentFrameId === targetFrame.parentFrameId && f.frameId !== targetFrame.parentFrameId);
-	const frameIndex = siblingFrames.findIndex((f) => f.frameId === frameId);
-	const sameUrlIndex = siblingFrames.filter((f) => f.url === targetFrame.url).findIndex((f) => f.frameId === frameId);
-	const localOffset = (await chrome.scripting.executeScript({
-		target: {
-			tabId,
-			frameIds: [targetFrame.parentFrameId]
-		},
-		world: "MAIN",
-		func: (frameUrl, frameIndex, sameUrlIndex) => {
-			const iframes = Array.from(document.querySelectorAll("iframe, frame"));
-			const urlMatches = frameUrl ? iframes.filter((iframe) => iframe.src === frameUrl) : [];
-			let target;
-			if (urlMatches.length === 1) target = urlMatches[0];
-			else if (sameUrlIndex >= 0 && sameUrlIndex < urlMatches.length) target = urlMatches[sameUrlIndex];
-			else if (frameIndex >= 0 && frameIndex < iframes.length) target = iframes[frameIndex];
-			else if (urlMatches.length > 0) target = urlMatches[0];
-			if (!target) return null;
-			const rect = target.getBoundingClientRect();
-			return {
-				x: rect.x + target.clientLeft,
-				y: rect.y + target.clientTop
-			};
-		},
-		args: [
-			targetFrame.url,
-			frameIndex,
-			sameUrlIndex
-		]
-	}))[0]?.result;
-	if (!localOffset) return null;
-	return {
-		x: parentOffset.x + localOffset.x,
-		y: parentOffset.y + localOffset.y
-	};
-}
-//#endregion
 //#region src/background/debugger-manager.ts
 var DebuggerBlockedError = class extends ExpectedOperationError {
 	code = "DEBUGGER_BLOCKED";
@@ -6510,53 +6614,28 @@ var FrameResolver = class {
 	async resolveFrame(params, context) {
 		const p = ResolveFrameSchema.parse(params);
 		const tabId = await this.getManagedScriptableTabId(p.tabId, context, "resolve_frame");
-		const allFrames = await chrome.webNavigation.getAllFrames({ tabId });
-		if (!allFrames) throw new Error("Failed to get frames");
-		const allChildFrames = allFrames.filter((f) => f.frameId !== 0);
-		if (allChildFrames.length === 0) throw new Error("No iframes found in page");
-		const directChildFrames = allFrames.filter((f) => f.parentFrameId === 0 && f.frameId !== 0);
-		const info = (await chrome.scripting.executeScript({
-			target: {
-				tabId,
-				frameIds: [0]
-			},
-			world: "MAIN",
-			func: (frame) => {
-				const iframes = Array.from(document.querySelectorAll("iframe, frame"));
-				let target;
-				let index = -1;
-				if (typeof frame === "number") {
-					if (frame < 0 || frame >= iframes.length) return null;
-					target = iframes[frame];
-					index = frame;
-				} else {
-					target = document.querySelector(frame);
-					if (target) index = iframes.indexOf(target);
-				}
-				if (!target) return null;
-				let absoluteSrc = target.src || "";
-				if (absoluteSrc && !absoluteSrc.startsWith("http") && !absoluteSrc.startsWith("about:")) try {
-					absoluteSrc = new URL(absoluteSrc, location.href).href;
-				} catch {}
-				return {
-					src: absoluteSrc,
-					index
-				};
-			},
-			args: [p.frame]
-		}))[0]?.result;
-		if (!info) throw new ExpectedOperationError(`iframe not found: ${typeof p.frame === "number" ? `index ${p.frame}` : `selector "${p.frame}"`}`);
-		let matchedFrameId;
-		if (info.src) {
-			const urlMatches = allChildFrames.filter((f) => f.url === info.src);
-			if (urlMatches.length === 1) matchedFrameId = urlMatches[0].frameId;
+		const snapshot = await getDomFrameSnapshot(tabId, 0, p.frame);
+		if (snapshot.selectionStatus !== "found" || snapshot.selectedIndex === null) {
+			const desc = typeof p.frame === "number" ? `index ${p.frame}` : `selector "${p.frame}"`;
+			const detail = snapshot.selectionError ? `: ${snapshot.selectionError}` : "";
+			throw new ExpectedOperationError(`iframe not found: ${desc} (${snapshot.selectionStatus})${detail}`);
 		}
-		if (matchedFrameId === void 0 && info.index >= 0 && info.index < directChildFrames.length) matchedFrameId = directChildFrames[info.index].frameId;
-		if (matchedFrameId === void 0) throw new Error(`Cannot resolve iframe to frameId. src: "${info.src}", directChildren: ${directChildFrames.length}, allFrames: ${allChildFrames.length}`);
-		const offset = await getFrameOffset(tabId, matchedFrameId);
+		const selected = snapshot.frames.find((frame) => frame.index === snapshot.selectedIndex);
+		if (!selected || selected.frameId === null) throw new ExpectedOperationError(JSON.stringify({ error: {
+			code: "FRAME_IDENTITY_UNAVAILABLE",
+			message: "Cannot map the selected DOM iframe to one Chrome frameId",
+			suggestion: "请等待 iframe 完成加载后重试；工具不会按 webNavigation 列表顺序选择其他 frame",
+			context: {
+				tabId,
+				selection: p.frame,
+				domIndex: snapshot.selectedIndex,
+				candidateFrameIds: selected?.candidateFrameIds ?? [],
+				domFrameCount: snapshot.frames.length
+			}
+		} }));
 		return {
-			frameId: matchedFrameId,
-			offset
+			frameId: selected.frameId,
+			offset: selected.contentOffset
 		};
 	}
 	async getAllFrames(params, context) {
@@ -6564,80 +6643,20 @@ var FrameResolver = class {
 		const tabId = await this.getManagedScriptableTabId(p.tabId, context, "get_all_frames");
 		const frames = await chrome.webNavigation.getAllFrames({ tabId });
 		if (!frames) throw new Error("Failed to get frames");
-		let mainFrameInfo = {
-			title: null,
-			rect: {
-				x: 0,
-				y: 0,
-				width: 0,
-				height: 0
-			}
-		};
-		let domFrames = [];
-		try {
-			const pageFrames = (await chrome.scripting.executeScript({
-				target: {
-					tabId,
-					frameIds: [0]
-				},
-				world: "MAIN",
-				func: () => ({
-					main: {
-						title: document.title || null,
-						rect: {
-							x: 0,
-							y: 0,
-							width: window.innerWidth,
-							height: window.innerHeight
-						}
-					},
-					frames: Array.from(document.querySelectorAll("iframe, frame")).map((frame, index) => {
-						const el = frame;
-						const rect = el.getBoundingClientRect();
-						const selector = el.id ? `#${CSS.escape(el.id)}` : `${el.tagName.toLowerCase()}:nth-of-type(${index + 1})`;
-						return {
-							index,
-							url: el.src || "",
-							title: el.title || null,
-							name: el.name || null,
-							selector,
-							rect: {
-								x: rect.x,
-								y: rect.y,
-								width: rect.width,
-								height: rect.height
-							}
-						};
-					})
-				})
-			}))[0]?.result;
-			mainFrameInfo = pageFrames?.main ?? mainFrameInfo;
-			domFrames = pageFrames?.frames ?? [];
-		} catch {
-			domFrames = [];
-		}
-		const directChildFrames = frames.filter((frame) => frame.parentFrameId === 0 && frame.frameId !== 0);
-		const getDomFrame = (frame) => {
-			if (frame.parentFrameId !== 0) return;
-			const directIndex = directChildFrames.findIndex((candidate) => candidate.frameId === frame.frameId);
-			const byIndex = directIndex >= 0 ? domFrames[directIndex] : void 0;
-			if (byIndex) return byIndex;
-			const navigationMatches = directChildFrames.filter((candidate) => candidate.url === frame.url);
-			const domMatches = domFrames.filter((candidate) => candidate.url === frame.url);
-			return navigationMatches.length === 1 && domMatches.length === 1 ? domMatches[0] : void 0;
-		};
+		const snapshot = await getDomFrameSnapshot(tabId, 0);
+		const domFramesByFrameId = new Map(snapshot.frames.filter((frame) => frame.frameId !== null).map((frame) => [frame.frameId, frame]));
 		return { frames: frames.map((frame, index) => {
 			const isMainFrame = frame.frameId === 0;
-			const dom = isMainFrame ? void 0 : getDomFrame(frame);
+			const dom = isMainFrame ? void 0 : domFramesByFrameId.get(frame.frameId);
 			return {
 				index,
 				frameId: frame.frameId,
 				parentFrameId: isMainFrame ? null : frame.parentFrameId,
 				url: frame.url,
-				title: isMainFrame ? mainFrameInfo.title : dom?.title ?? null,
+				title: isMainFrame ? snapshot.parent.title : dom?.title ?? null,
 				name: isMainFrame ? null : dom?.name ?? null,
 				selector: isMainFrame ? null : dom?.selector ?? null,
-				rect: isMainFrame ? mainFrameInfo.rect : dom?.rect ?? null
+				rect: isMainFrame ? snapshot.parent.rect : dom?.rect ?? null
 			};
 		}) };
 	}
@@ -6656,7 +6675,8 @@ var FrameResolver = class {
 		const originalFrame = await this.getExtensionFrameIdentity(tabId, p.frameId);
 		let retryAttempted = false;
 		let retryReason;
-		for (let attempt = 0; attempt < 2; attempt++) {
+		const maxAttempts = p.staleContextRetry === "readOnly" ? 2 : 1;
+		for (let attempt = 0; attempt < maxAttempts; attempt++) {
 			const remaining = p.timeout === void 0 ? void 0 : p.timeout - (Date.now() - startedAt);
 			if (remaining !== void 0 && remaining <= 0) throw this.frameEvaluationError("FRAME_EVALUATION_TIMEOUT", "Frame evaluation timed out before resolution", {
 				tabId,
@@ -6713,6 +6733,7 @@ var FrameResolver = class {
 					...await chrome.debugger.sendCommand({ tabId }, "Runtime.evaluate", evalParams),
 					retryAttempted,
 					retryReason,
+					staleContextRetry: p.staleContextRetry,
 					frameContext: {
 						tabId,
 						extensionFrameId: identity.frameId,
@@ -6736,6 +6757,14 @@ var FrameResolver = class {
 					retryReason
 				});
 				if (!staleContext) throw error;
+				if (p.staleContextRetry !== "readOnly") throw this.frameEvaluationError("FRAME_STALE_CONTEXT", "Execution context became stale; script was not replayed because staleContextRetry is never", {
+					tabId,
+					...this.frameIdentitySummary(identity),
+					cdpFrameId: resolved.cdpFrameId,
+					executionContextId: targetCtx.id,
+					retryAttempted: false,
+					staleContextRetry: p.staleContextRetry
+				});
 				retryAttempted = true;
 				retryReason = message.slice(0, 500);
 				this.debuggerManager.invalidateExecutionContext(tabId, targetCtx.id);
@@ -8260,6 +8289,25 @@ function randomHex(bytes = 16) {
 	crypto.getRandomValues(data);
 	return bytesToHex(data);
 }
+var backgroundBundleHashPromise;
+async function loadBackgroundBundleHash() {
+	try {
+		const response = await fetch(chrome.runtime.getURL("service-worker-loader.js"), { cache: "no-store" });
+		if (!response.ok) {
+			console.warn(`[HTTP] Cannot read Extension service worker loader: HTTP ${response.status}`);
+			return;
+		}
+		const digest = await crypto.subtle.digest("SHA-256", await response.arrayBuffer());
+		return `sha256:${bytesToHex(new Uint8Array(digest))}`;
+	} catch (error) {
+		console.warn("[HTTP] Cannot compute Extension background bundle hash:", error instanceof Error ? error.message : String(error));
+		return;
+	}
+}
+function getBackgroundBundleHash() {
+	backgroundBundleHashPromise ??= loadBackgroundBundleHash();
+	return backgroundBundleHashPromise;
+}
 async function hmacHex(token, payload) {
 	const encoder = new TextEncoder();
 	const key = await crypto.subtle.importKey("raw", encoder.encode(token), {
@@ -8427,10 +8475,14 @@ var HttpClient = class {
 					};
 					this.connections.set(port, conn);
 					this.resetHeartbeat(port);
-					ws.send(JSON.stringify({
-						type: "hello",
-						version: chrome.runtime.getManifest().version
-					}));
+					getBackgroundBundleHash().then((backgroundBundleHash) => {
+						if (ws.readyState !== WebSocket.OPEN) return;
+						ws.send(JSON.stringify({
+							type: "hello",
+							version: chrome.runtime.getManifest().version,
+							...backgroundBundleHash ? { backgroundBundleHash } : {}
+						}));
+					});
 					console.log(`[HTTP] Connected to MCP Server at port ${port} (total: ${this.connections.size})`);
 					this.statusHandler?.("connected", this.connections.size);
 					resolve(true);
@@ -8635,11 +8687,11 @@ httpClient.onStatusChange((status, count) => {
 	updateBadge(status, count);
 	broadcastStatus(status, count);
 });
-chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
-	handleInternalMessage(message).then(sendResponse);
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+	handleInternalMessage(message, sender).then(sendResponse);
 	return true;
 });
-async function handleInternalMessage(message) {
+async function handleInternalMessage(message, sender) {
 	switch (message.type) {
 		case "CONNECT": return httpClient.connect();
 		case "DISCONNECT":
@@ -8657,6 +8709,7 @@ async function handleInternalMessage(message) {
 			pairingTokenConfigured: await httpClient.hasPairingToken(),
 			allowInsecureNoToken: await httpClient.isAllowInsecureNoToken()
 		};
+		case "MCP_FRAME_PROBE": return recordDomFrameProbe(message, sender);
 		default: return { error: "Unknown message type" };
 	}
 }