@pyrokine/mcp-chrome 1.7.0 → 2.0.1

package/dist/tools/extract.js

@@ -10,7 +10,7 @@
  * - metadata: 页面元信息（title/og/jsonLd 等）
  */
 import { mkdir, writeFile } from 'fs/promises';
-import { basename, dirname, extname, join } from 'path';
+import { basename, dirname, extname, join, resolve, sep } from 'path';
 import { z } from 'zod';
 import { formatErrorResponse, formatResponse, getSession, getUnifiedSession } from '../core/index.js';
 import { targetToFindParams, targetZodSchema } from './schema.js';
@@ -20,22 +20,48 @@ const MAX_APPENDIX_IMAGES = 20;
  * extract 参数 schema
  */
 const extractSchema = z.object({
-    type: z.enum(['text', 'html', 'attribute', 'screenshot', 'state', 'metadata'])
-        .describe('提取类型'),
-    target: targetZodSchema.optional().describe('目标元素（attribute 必填；text/html 可选，省略则提取整个页面；screenshot 可选用于元素截图；state 可选（仅 Extension）用于返回目标子树；metadata 不需要）'),
+    type: z.enum(['text', 'html', 'attribute', 'screenshot', 'state', 'metadata']).describe('提取类型'),
+    target: targetZodSchema
+        .optional()
+        .describe('目标元素（attribute 必填；text/html 可选，省略则提取整个页面；screenshot 可选用于元素截图；state 可选（仅 Extension）用于返回目标子树；metadata 不需要）'),
     attribute: z.string().optional().describe('属性名（attribute）'),
-    images: z.enum(['info', 'data']).optional().describe('图片提取模式（仅 html 类型有效）。info: 元信息（src/alt/尺寸）；data: 含图片数据'),
+    images: z
+        .enum(['info', 'data'])
+        .optional()
+        .describe('图片提取模式（仅 html 类型有效），info: 元信息（src/alt/尺寸）；data: 含图片数据'),
     fullPage: z.boolean().optional().describe('是否全页面截图（screenshot）'),
-    scale: z.number().optional().describe('截图缩放比例（screenshot fullPage）。默认 1，设为 0.5 可降低分辨率加速大页面截图'),
-    format: z.enum(['png', 'jpeg', 'webp']).optional().describe('截图格式（screenshot）。默认 png，jpeg/webp 体积更小，复杂页面推荐 jpeg 减少超时'),
-    quality: z.number().min(0).max(100).optional().describe('截图质量（screenshot，仅 jpeg/webp 有效）。0-100，推荐 80'),
-    output: z.string()
+    scale: z
+        .number()
+        .optional()
+        .describe('截图缩放比例（screenshot fullPage），默认 1，设为 0.5 可降低分辨率加速大页面截图'),
+    format: z
+        .enum(['png', 'jpeg', 'webp'])
+        .optional()
+        .describe('截图格式（screenshot），默认 png，jpeg/webp 体积更小，复杂页面推荐 jpeg 减少超时'),
+    quality: z
+        .number()
+        .min(0)
+        .max(100)
+        .optional()
+        .describe('截图质量（screenshot，仅 jpeg/webp 有效），0-100，推荐 80'),
+    output: z
+        .string()
         .optional()
-        .describe('输出文件路径（可选）。若指定，结果写入文件；否则返回内容。images=data 时作为输出目录路径'),
-    tabId: z.string().optional().describe('目标 Tab ID（可选，仅 Extension 模式）。不指定则使用当前 attach 的 tab。可操作非当前 attach 的 tab。CDP 模式下不支持此参数'),
+        .describe('输出文件路径（可选），若指定结果写入文件，否则返回内容，images=data 时作为输出目录路径'),
+    tabId: z
+        .string()
+        .optional()
+        .describe('目标 Tab ID（可选，仅 Extension 模式），不指定则使用当前 attach 的 tab，可操作非当前 attach 的 tab，CDP 模式下不支持此参数'),
     depth: z.number().optional().describe('DOM 遍历深度限制（state），默认 15，减小可降低返回数据量'),
+    mode: z
+        .enum(['accessibility', 'domsnapshot'])
+        .optional()
+        .describe('页面状态提取模式（state 类型有效），accessibility=可访问性树（默认，与原 read_page 一致），domsnapshot=CDP DOMSnapshot 全量快照（仅 CDP 模式）'),
     timeout: z.number().optional().describe('等待目标元素超时'),
-    frame: z.union([z.string(), z.number()]).optional().describe('iframe 定位（可选，仅 Extension 模式）。CSS 选择器（如 "iframe#main"）或索引（如 0）。不指定则在主框架操作'),
+    frame: z
+        .union([z.string(), z.number()])
+        .optional()
+        .describe('iframe 定位（可选，仅 Extension 模式），CSS 选择器（如 "iframe#main"）或索引（如 0），不指定则在主框架操作'),
 });
 /**
  * extract 工具处理器
@@ -98,36 +124,10 @@ async function handleExtract(args) {
                     }
                     case 'attribute': {
                         if (!args.target) {
-                            return {
-                                content: [
-                                    {
-                                        type: 'text',
-                                        text: JSON.stringify({
-                                            error: {
-                                                code: 'INVALID_ARGUMENT',
-                                                message: 'attribute 提取需要 target 参数',
-                                            },
-                                        }),
-                                    },
-                                ],
-                                isError: true,
-                            };
+                            return formatErrorResponse(new Error('attribute 提取需要 target 参数'));
                         }
                         if (!args.attribute) {
-                            return {
-                                content: [
-                                    {
-                                        type: 'text',
-                                        text: JSON.stringify({
-                                            error: {
-                                                code: 'INVALID_ARGUMENT',
-                                                message: 'attribute 提取需要 attribute 参数',
-                                            },
-                                        }),
-                                    },
-                                ],
-                                isError: true,
-                            };
+                            return formatErrorResponse(new Error('attribute 提取需要 attribute 参数'));
                         }
                         let value;
                         if (useExtension) {
@@ -147,84 +147,20 @@ async function handleExtract(args) {
                         // 有 target 时获取元素区域用于裁剪（支持所有 target 类型）
                         let clip;
                         if (args.target) {
-                            if (useExtension) {
-                                const { selector, text, xpath, nth: nthParam, } = targetToFindParams(args.target);
-                                const nth = nthParam ?? 0;
-                                const found = await unifiedSession.find(selector, text, xpath);
-                                if (found.length > nth) {
-                                    const rect = found[nth].rect;
-                                    if (rect.width > 0 && rect.height > 0) {
-                                        // find() 返回视口绝对坐标（已包含 iframe 坐标修正）
-                                        clip = rect;
-                                    }
-                                }
-                            }
-                            else {
-                                const { selector, text, xpath, nth: nthParam, } = targetToFindParams(args.target);
-                                const nth = nthParam ?? 0;
-                                const rect = await session.evaluate(`function(selector, text, xpath, nth) {
-                                        function toRect(el) {
-                                            var r = el.getBoundingClientRect();
-                                            return {x: r.x, y: r.y, width: r.width, height: r.height};
-                                        }
-
-                                        function findByXPath(xp, n) {
-                                            var r = document.evaluate(xp, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-                                            return r.snapshotLength > n ? r.snapshotItem(n) : null;
-                                        }
-
-                                        function findBySelector(sel, txt, n) {
-                                            var els = document.querySelectorAll(sel);
-                                            var matchCount = 0;
-                                            for (var i = 0; i < els.length; ++i) {
-                                                var el = els[i];
-                                                if (txt) {
-                                                    var content = (el.textContent || '').trim();
-                                                    if (!content.includes(txt)) continue;
-                                                }
-                                                if (matchCount < n) { ++matchCount; continue; }
-                                                return el;
-                                            }
-                                            return null;
-                                        }
-
-                                        function findByText(txt, n) {
-                                            var root = document.body || document.documentElement;
-                                            if (!root) return null;
-                                            var walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
-                                            var matchCount = 0;
-                                            var el = walker.currentNode;
-                                            while (el) {
-                                                var content = (el.textContent || '').trim();
-                                                if (content && content.includes(txt)) {
-                                                    if (matchCount < n) { ++matchCount; }
-                                                    else { return el; }
-                                                }
-                                                el = walker.nextNode();
-                                            }
-                                            return null;
-                                        }
-
-                                        var el = null;
-                                        if (xpath) {
-                                            el = findByXPath(xpath, nth);
-                                        } else if (selector) {
-                                            el = findBySelector(selector, text, nth);
-                                        } else if (text) {
-                                            el = findByText(text, nth);
-                                        }
-
-                                        return el ? toRect(el) : null;
-                                    }`, [selector ?? null, text ?? null, xpath ?? null, nth]);
-                                if (rect && rect.width > 0 && rect.height > 0) {
+                            const { selector, text, xpath, nth: nthParam, } = targetToFindParams(args.target);
+                            const nth = nthParam ?? 0;
+                            // unified.find 内部根据 Extension 连接状态自动路由到 Extension/CDP 路径，
+                            // 返回视口绝对坐标（含 iframe 坐标修正）
+                            const found = await unifiedSession.find(selector, text, xpath);
+                            if (found.length > nth) {
+                                const rect = found[nth].rect;
+                                if (rect.width > 0 && rect.height > 0) {
                                     clip = rect;
                                 }
                             }
                         }
                         const base64 = await unifiedSession.screenshot({
-                            fullPage: clip ?
-                                false :
-                                (args.fullPage ?? false),
+                            fullPage: clip ? false : (args.fullPage ?? false),
                             scale: args.scale,
                             format: args.format,
                             quality: args.quality,
@@ -245,12 +181,52 @@ async function handleExtract(args) {
                                 {
                                     type: 'image',
                                     data: base64,
-                                    mimeType: `image/${args.format === 'jpeg' ? 'jpeg' : args.format ?? 'png'}`,
+                                    mimeType: `image/${args.format === 'jpeg' ? 'jpeg' : (args.format ?? 'png')}`,
                                 },
                             ],
                         };
                     }
                     case 'state': {
+                        // mode=domsnapshot：用 CDP DOMSnapshot.captureSnapshot 取全量快照（仅 CDP 模式）
+                        if (args.mode === 'domsnapshot') {
+                            if (useExtension) {
+                                return {
+                                    content: [
+                                        {
+                                            type: 'text',
+                                            text: JSON.stringify({
+                                                error: {
+                                                    code: 'INVALID_ARGUMENT',
+                                                    message: 'mode=domsnapshot 仅 CDP 模式支持，Extension 模式请用默认 accessibility',
+                                                },
+                                            }),
+                                        },
+                                    ],
+                                    isError: true,
+                                };
+                            }
+                            const snapshot = await unifiedSession.sendCdpCommand('DOMSnapshot.captureSnapshot', {
+                                computedStyles: ['display', 'visibility', 'opacity'],
+                                includePaintOrder: false,
+                                includeDOMRects: true,
+                            });
+                            if (args.output) {
+                                await writeOutputFile(args.output, JSON.stringify(snapshot, null, 2), 'utf-8');
+                                return formatResponse({
+                                    success: true,
+                                    type: 'state',
+                                    mode: 'domsnapshot',
+                                    output: args.output,
+                                });
+                            }
+                            return formatResponse({
+                                success: true,
+                                type: 'state',
+                                mode: 'domsnapshot',
+                                snapshot,
+                            });
+                        }
+                        // 默认：accessibility 树（原行为）
                         // 有 target 时获取子树的无障碍状态
                         let refId;
                         if (args.target && useExtension) {
@@ -323,10 +299,15 @@ async function handleExtract(args) {
     }
 }
 // ==================== HTML + 图片提取 ====================
-/** 写入文件前自动创建父目录 */
+/** 写入文件前自动创建父目录（验证路径在 cwd 范围内）*/
 async function writeOutputFile(path, data, encoding) {
-    await mkdir(dirname(path), { recursive: true });
-    await writeFile(path, data, encoding);
+    const cwd = process.cwd();
+    const safePath = resolve(cwd, path);
+    if (!safePath.startsWith(cwd + sep) && safePath !== cwd) {
+        throw new Error(`output 路径超出工作目录范围: ${path}`);
+    }
+    await mkdir(dirname(safePath), { recursive: true });
+    await writeFile(safePath, data, encoding);
 }
 /**
  * 处理 html + images 提取
@@ -350,7 +331,11 @@ async function handleHtmlWithImages(unifiedSession, session, useExtension, args)
                 var images = [];
                 for (var i = 0; i < imgList.length; i++) {
                     var img = imgList[i];
-                    images.push({index: i, src: img.src, dataSrc: (function() { var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || ''; if (!raw) return ''; try { return new URL(raw, location.href).href } catch(e) { return raw } })(), alt: img.alt, width: img.width, height: img.height, naturalWidth: img.naturalWidth, naturalHeight: img.naturalHeight});
+                    images.push({index: i, src: img.src, dataSrc: (function() {
+                        var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || '';
+                        if (!raw) return ''; try { return new URL(raw, location.href).href } catch(e) { return raw }
+                    })(), alt: img.alt, width: img.width, height: img.height,
+                        naturalWidth: img.naturalWidth, naturalHeight: img.naturalHeight});
                 }
                 return {html: html, images: images};
             })`, undefined, undefined, [selector, nth]);
@@ -381,14 +366,19 @@ async function handleHtmlWithImages(unifiedSession, session, useExtension, args)
     const appendixMode = !args.output;
     const imageDataList = await fetchImageData(unifiedSession, result.images, appendixMode ? MAX_APPENDIX_IMAGES : undefined);
     if (args.output) {
+        const cwd2 = process.cwd();
+        const safeOutputDir = resolve(cwd2, args.output);
+        if (!safeOutputDir.startsWith(cwd2 + sep) && safeOutputDir !== cwd2) {
+            return formatErrorResponse(new Error(`output 路径超出工作目录范围: ${args.output}`));
+        }
         // 写入目录
-        await writeImageDirectory(args.output, result.html, result.images, imageDataList);
+        await writeImageDirectory(safeOutputDir, result.html, result.images, imageDataList);
         return formatResponse({
             success: true,
             type: 'html',
-            output: args.output,
+            output: safeOutputDir,
             imageCount: result.images.length,
-            index: join(args.output, 'index.json'),
+            index: join(safeOutputDir, 'index.json'),
         });
     }
     // 无 output：MCP 附录方式返回
@@ -408,7 +398,11 @@ async function extractHtmlWithImagesCdp(session, selector, timeout) {
             var images = [];
             for (var i = 0; i < imgList.length; i++) {
                 var img = imgList[i];
-                images.push({index: i, src: img.src, dataSrc: (function() { var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || ''; if (!raw) return ''; try { return new URL(raw, location.href).href } catch(e) { return raw } })(), alt: img.alt, width: img.width, height: img.height, naturalWidth: img.naturalWidth, naturalHeight: img.naturalHeight});
+                images.push({index: i, src: img.src, dataSrc: (function() {
+                    var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || '';
+                    if (!raw) return ''; try { return new URL(raw, location.href).href } catch(e) { return raw }
+                })(), alt: img.alt, width: img.width, height: img.height,
+                    naturalWidth: img.naturalWidth, naturalHeight: img.naturalHeight});
             }
             return {html: html, images: images};
         }`);
@@ -419,7 +413,11 @@ async function extractHtmlWithImagesCdp(session, selector, timeout) {
         var images = [];
         for (var i = 0; i < imgs.length; i++) {
             var img = imgs[i];
-            images.push({index: i, src: img.src, dataSrc: (function() { var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || ''; if (!raw) return ''; try { return new URL(raw, location.href).href } catch(e) { return raw } })(), alt: img.alt, width: img.width, height: img.height, naturalWidth: img.naturalWidth, naturalHeight: img.naturalHeight});
+            images.push({index: i, src: img.src, dataSrc: (function() {
+                var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || '';
+                if (!raw) return ''; try { return new URL(raw, location.href).href } catch(e) { return raw }
+            })(), alt: img.alt, width: img.width, height: img.height,
+                naturalWidth: img.naturalWidth, naturalHeight: img.naturalHeight});
         }
         return {html: html, images: images};
     })()`);
@@ -448,10 +446,10 @@ async function fetchImageData(unifiedSession, images, limit) {
             continue;
         }
         if (effectiveSrc.startsWith('data:')) {
-            const match = effectiveSrc.match(/^data:([^;]+);base64,(.+)$/);
-            preResolved.push(match ?
-                { base64: match[2], mimeType: match[1] } :
-                { base64: null, mimeType: 'image/png' });
+            const match = effectiveSrc.match(/^data:(?<mime>[^;]+);base64,(?<data>.+)$/);
+            preResolved.push(match
+                ? { base64: match.groups.data, mimeType: match.groups.mime }
+                : { base64: null, mimeType: 'image/png' });
             continue;
         }
         if (!effectiveSrc.startsWith('http')) {
@@ -591,7 +589,7 @@ function buildImageAppendixResponse(html, images, imageDataList) {
     if (images.length > MAX_APPENDIX_IMAGES) {
         content.push({
             type: 'text',
-            text: `\n（共 ${images.length} 张图片，仅前 ${MAX_APPENDIX_IMAGES} 张附带数据。使用 output 参数导出全部图片）`,
+            text: `\n（共 ${images.length} 张图片，仅前 ${MAX_APPENDIX_IMAGES} 张附带数据，使用 output 参数导出全部图片）`,
         });
     }
     return { content };
@@ -607,10 +605,14 @@ function guessMimeType(url) {
         return 'image/png';
     }
     const map = {
-        '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg',
-        '.png': 'image/png', '.gif': 'image/gif',
-        '.webp': 'image/webp', '.svg': 'image/svg+xml',
-        '.ico': 'image/x-icon', '.bmp': 'image/bmp',
+        '.jpg': 'image/jpeg',
+        '.jpeg': 'image/jpeg',
+        '.png': 'image/png',
+        '.gif': 'image/gif',
+        '.webp': 'image/webp',
+        '.svg': 'image/svg+xml',
+        '.ico': 'image/x-icon',
+        '.bmp': 'image/bmp',
         '.avif': 'image/avif',
     };
     return map[ext] ?? 'image/png';
@@ -618,10 +620,14 @@ function guessMimeType(url) {
 /** MIME 类型转文件扩展名 */
 function mimeToExt(mimeType) {
     const map = {
-        'image/jpeg': '.jpg', 'image/png': '.png',
-        'image/gif': '.gif', 'image/webp': '.webp',
-        'image/svg+xml': '.svg', 'image/x-icon': '.ico',
-        'image/bmp': '.bmp', 'image/avif': '.avif',
+        'image/jpeg': '.jpg',
+        'image/png': '.png',
+        'image/gif': '.gif',
+        'image/webp': '.webp',
+        'image/svg+xml': '.svg',
+        'image/x-icon': '.ico',
+        'image/bmp': '.bmp',
+        'image/avif': '.avif',
     };
     return map[mimeType] ?? '.png';
 }
@@ -696,20 +702,42 @@ async function extractTextExtension(unifiedSession, target) {
     if (!target) {
         return unifiedSession.getText();
     }
+    if ('x' in target && 'y' in target && typeof target.x === 'number' && typeof target.y === 'number') {
+        const expr = '(function(x, y) { var el = document.elementFromPoint(x, y); ' +
+            "return el ? (el.textContent || '') : '' })";
+        return unifiedSession.evaluate(expr, undefined, undefined, [target.x, target.y]);
+    }
     const { selector, text, xpath, nth: nthParam } = targetToFindParams(target);
     const nth = nthParam ?? 0;
     if (selector) {
+        if (text) {
+            const expr = '(function(s, t, n) { var els = Array.from(document.querySelectorAll(s))' +
+                '.filter(function(e) { return (e.textContent || "").includes(t); }); ' +
+                "return n < els.length ? (els[n].textContent || '') : '' })";
+            return unifiedSession.evaluate(expr, undefined, undefined, [selector, text, nth]);
+        }
         if (nth > 0) {
-            return unifiedSession.evaluate(`(function(s, n) { var els = document.querySelectorAll(s); return n < els.length ? (els[n].textContent || '') : '' })`, undefined, undefined, [selector, nth]);
+            const expr = '(function(s, n) { var els = document.querySelectorAll(s); ' +
+                "return n < els.length ? (els[n].textContent || '') : '' })";
+            return unifiedSession.evaluate(expr, undefined, undefined, [selector, nth]);
         }
         return unifiedSession.getText(selector);
     }
     // xpath/text 定位：通过 evaluate 在页面上下文中查找
     if (xpath) {
-        return unifiedSession.evaluate(`(function(xp, n) { var r = document.evaluate(xp, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); return n < r.snapshotLength ? (r.snapshotItem(n).textContent || '') : '' })`, undefined, undefined, [xpath, nth]);
+        const expr = '(function(xp, n) { var r = document.evaluate(xp, document, null, ' +
+            'XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); ' +
+            "return n < r.snapshotLength ? (r.snapshotItem(n).textContent || '') : '' })";
+        return unifiedSession.evaluate(expr, undefined, undefined, [xpath, nth]);
     }
     if (text) {
-        return unifiedSession.evaluate(`(function(t, n) { var els = document.querySelectorAll('*'); var found = []; for (var i = 0; i < els.length; i++) { var cn = els[i].childNodes; for (var j = 0; j < cn.length; j++) { if (cn[j].nodeType === 3 && cn[j].textContent && cn[j].textContent.includes(t)) { found.push(els[i]); break; } } } return n < found.length ? (found[n].textContent || '') : '' })`, undefined, undefined, [text, nth]);
+        const expr = '(function(t, n) { var walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT); ' +
+            'var found = []; var seen = new WeakSet(); var node; ' +
+            'while ((node = walker.nextNode())) { if (node.textContent && node.textContent.includes(t) ' +
+            '&& node.parentElement && !seen.has(node.parentElement)) { ' +
+            'seen.add(node.parentElement); found.push(node.parentElement); } } ' +
+            "return n < found.length ? (found[n].textContent || '') : '' })";
+        return unifiedSession.evaluate(expr, undefined, undefined, [text, nth]);
     }
     return unifiedSession.getText();
 }
@@ -721,20 +749,41 @@ async function extractHtmlExtension(unifiedSession, target, outer = true) {
     if (!target) {
         return unifiedSession.getHtml(undefined, outer);
     }
+    const prop = outer ? 'outerHTML' : 'innerHTML';
+    if ('x' in target && 'y' in target && typeof target.x === 'number' && typeof target.y === 'number') {
+        const expr = '(function(x, y, p) { var el = document.elementFromPoint(x, y); ' + "return el ? (el[p] || '') : '' })";
+        return unifiedSession.evaluate(expr, undefined, undefined, [target.x, target.y, prop]);
+    }
     const { selector, text, xpath, nth: nthParam } = targetToFindParams(target);
     const nth = nthParam ?? 0;
-    const prop = outer ? 'outerHTML' : 'innerHTML';
     if (selector) {
+        if (text) {
+            const expr = '(function(s, t, n, p) { var els = Array.from(document.querySelectorAll(s))' +
+                '.filter(function(e) { return (e.textContent || "").includes(t); }); ' +
+                "return n < els.length ? (els[n][p] || '') : '' })";
+            return unifiedSession.evaluate(expr, undefined, undefined, [selector, text, nth, prop]);
+        }
         if (nth > 0) {
-            return unifiedSession.evaluate(`(function(s, n, p) { var els = document.querySelectorAll(s); return n < els.length ? (els[n][p] || '') : '' })`, undefined, undefined, [selector, nth, prop]);
+            const expr = '(function(s, n, p) { var els = document.querySelectorAll(s); ' +
+                "return n < els.length ? (els[n][p] || '') : '' })";
+            return unifiedSession.evaluate(expr, undefined, undefined, [selector, nth, prop]);
         }
         return unifiedSession.getHtml(selector, outer);
     }
     if (xpath) {
-        return unifiedSession.evaluate(`(function(xp, n, p) { var r = document.evaluate(xp, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); return n < r.snapshotLength ? (r.snapshotItem(n)[p] || '') : '' })`, undefined, undefined, [xpath, nth, prop]);
+        const expr = '(function(xp, n, p) { var r = document.evaluate(xp, document, null, ' +
+            'XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); ' +
+            "return n < r.snapshotLength ? (r.snapshotItem(n)[p] || '') : '' })";
+        return unifiedSession.evaluate(expr, undefined, undefined, [xpath, nth, prop]);
     }
     if (text) {
-        return unifiedSession.evaluate(`(function(t, n, p) { var els = document.querySelectorAll('*'); var found = []; for (var i = 0; i < els.length; i++) { var cn = els[i].childNodes; for (var j = 0; j < cn.length; j++) { if (cn[j].nodeType === 3 && cn[j].textContent && cn[j].textContent.includes(t)) { found.push(els[i]); break; } } } return n < found.length ? (found[n][p] || '') : '' })`, undefined, undefined, [text, nth, prop]);
+        const expr = '(function(t, n, p) { var walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT); ' +
+            'var found = []; var seen = new WeakSet(); var node; ' +
+            'while ((node = walker.nextNode())) { if (node.textContent && node.textContent.includes(t) ' +
+            '&& node.parentElement && !seen.has(node.parentElement)) { ' +
+            'seen.add(node.parentElement); found.push(node.parentElement); } } ' +
+            "return n < found.length ? (found[n][p] || '') : '' })";
+        return unifiedSession.evaluate(expr, undefined, undefined, [text, nth, prop]);
     }
     return unifiedSession.getHtml(undefined, outer);
 }
@@ -742,14 +791,25 @@ async function extractHtmlExtension(unifiedSession, target, outer = true) {
  * Extension 模式：提取属性
  */
 async function extractAttributeExtension(unifiedSession, target, attribute) {
+    if ('x' in target && 'y' in target && typeof target.x === 'number' && typeof target.y === 'number') {
+        if (attribute.startsWith('computed:')) {
+            const prop = attribute.slice('computed:'.length);
+            const expr = '(function(x, y, p) { var el = document.elementFromPoint(x, y); ' +
+                'return el ? window.getComputedStyle(el).getPropertyValue(p) : null })';
+            return unifiedSession.evaluate(expr, undefined, undefined, [target.x, target.y, prop]);
+        }
+        const expr = '(function(x, y, a) { var el = document.elementFromPoint(x, y); ' +
+            'return el ? el.getAttribute(a) : null })';
+        return unifiedSession.evaluate(expr, undefined, undefined, [target.x, target.y, attribute]);
+    }
     const { selector, text, xpath, nth: nthParam } = targetToFindParams(target);
     // computed style: computed:color → getComputedStyle(el)
     if (attribute.startsWith('computed:')) {
         const prop = attribute.slice('computed:'.length);
         return extractComputedStyleExtension(unifiedSession, selector, text, xpath, nthParam ?? 0, prop);
     }
-    // xpath/text 定位需要先 find 得到 refId，再获取属性
-    if (xpath || text) {
+    // xpath 定位（含 text+xpath）或 text 且无 selector 时：先 find 得到 refId，再获取属性
+    if (xpath || (text && !selector)) {
         const elements = await unifiedSession.find(selector, text, xpath);
         if (elements.length > 0) {
             const nth = nthParam ?? 0;
@@ -762,8 +822,17 @@ async function extractAttributeExtension(unifiedSession, target, attribute) {
     }
     if (selector) {
         const nth = nthParam ?? 0;
+        if (text) {
+            // selector + text 组合：find 已实现 AND 过滤
+            const elements = await unifiedSession.find(selector, text, undefined);
+            if (nth >= elements.length)
+                return null;
+            return unifiedSession.getAttribute(undefined, elements[nth].refId, attribute);
+        }
         if (nth > 0) {
-            return unifiedSession.evaluate(`(function(s, n, a) { var els = document.querySelectorAll(s); return n < els.length ? els[n].getAttribute(a) : null })`, undefined, undefined, [selector, nth, attribute]);
+            const expr = '(function(s, n, a) { var els = document.querySelectorAll(s); ' +
+                'return n < els.length ? els[n].getAttribute(a) : null })';
+            return unifiedSession.evaluate(expr, undefined, undefined, [selector, nth, attribute]);
         }
         return unifiedSession.getAttribute(selector, undefined, attribute);
     }
@@ -784,8 +853,8 @@ async function extractComputedStyleExtension(unifiedSession, selector, text, xpa
 /**
  * Extension 模式：等待目标元素出现
  *
- * 在 extract 操作前轮询 find()，直到找到匹配元素或超时。
- * 用于实现 extract 的 timeout 参数语义。
+ * 在 extract 操作前轮询 find()，直到找到匹配元素或超时，
+ * 用于实现 extract 的 timeout 参数语义
  */
 async function waitForTargetExtension(unifiedSession, target, timeout) {
     const startTime = Date.now();
@@ -801,7 +870,7 @@ async function waitForTargetExtension(unifiedSession, target, timeout) {
         }
         if (!unifiedSession.isExtensionConnected()) {
             lastError = new Error('Extension 未连接');
-            await new Promise(r => setTimeout(r, retryDelay));
+            await new Promise((r) => setTimeout(r, retryDelay));
             continue;
         }
         try {
@@ -813,16 +882,15 @@ async function waitForTargetExtension(unifiedSession, target, timeout) {
         }
         catch (err) {
             // 暂时性错误（RPC 超时、发送失败、连接断开）可重试，其他确定性错误立即抛出
-            if (err instanceof
-                Error &&
+            if (err instanceof Error &&
                 /Request timeout|Failed to send|disconnect|未连接|stopped|replaced/i.test(err.message)) {
                 lastError = err;
-                await new Promise(r => setTimeout(r, retryDelay));
+                await new Promise((r) => setTimeout(r, retryDelay));
                 continue;
             }
             throw err;
         }
-        await new Promise(r => setTimeout(r, retryDelay));
+        await new Promise((r) => setTimeout(r, retryDelay));
     }
 }
 /**