@pyrokine/mcp-chrome 1.0.0 → 1.1.0

package/dist/tools/cookies.d.ts

@@ -2,10 +2,10 @@
  * cookies 工具
  *
  * Cookie 管理：
- * - get: 获取 cookies
+ * - get: 获取 cookies（支持多种过滤条件）
  * - set: 设置 cookie
- * - delete: 删除 cookie
- * - clear: 清空所有 cookies
+ * - delete: 删除指定 cookie
+ * - clear: 清空 cookies（支持按域名过滤）
  */
 /**
  * cookies 工具定义
@@ -21,37 +21,45 @@ export declare const cookiesToolDefinition: {
                 enum: string[];
                 description: string;
             };
+            url: {
+                type: string;
+                description: string;
+            };
             name: {
                 type: string;
                 description: string;
             };
+            domain: {
+                type: string;
+                description: string;
+            };
+            path: {
+                type: string;
+                description: string;
+            };
+            secure: {
+                type: string;
+                description: string;
+            };
+            session: {
+                type: string;
+                description: string;
+            };
             value: {
                 type: string;
                 description: string;
             };
-            options: {
+            httpOnly: {
+                type: string;
+                description: string;
+            };
+            sameSite: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            expirationDate: {
                 type: string;
-                properties: {
-                    domain: {
-                        type: string;
-                    };
-                    path: {
-                        type: string;
-                    };
-                    expires: {
-                        type: string;
-                    };
-                    httpOnly: {
-                        type: string;
-                    };
-                    secure: {
-                        type: string;
-                    };
-                    sameSite: {
-                        type: string;
-                        enum: string[];
-                    };
-                };
                 description: string;
             };
             output: {

package/dist/tools/cookies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsCjC,CAAA;AAwBD;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1D,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC,CAwKD"}
+{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DjC,CAAA;AAyBD;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1D,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC,CAiPD"}

package/dist/tools/cookies.js

@@ -2,14 +2,14 @@
  * cookies 工具
  *
  * Cookie 管理：
- * - get: 获取 cookies
+ * - get: 获取 cookies（支持多种过滤条件）
  * - set: 设置 cookie
- * - delete: 删除 cookie
- * - clear: 清空所有 cookies
+ * - delete: 删除指定 cookie
+ * - clear: 清空 cookies（支持按域名过滤）
  */
 import { writeFile } from 'fs/promises';
 import { z } from 'zod';
-import { formatErrorResponse, getSession } from '../core/index.js';
+import { formatErrorResponse, getUnifiedSession } from '../core/index.js';
 /**
  * cookies 工具定义
  */
@@ -24,26 +24,50 @@ export const cookiesToolDefinition = {
                 enum: ['get', 'set', 'delete', 'clear'],
                 description: '操作类型',
             },
+            // 通用过滤参数（get/clear）
+            url: {
+                type: 'string',
+                description: 'URL 过滤（get/clear/set/delete）',
+            },
             name: {
                 type: 'string',
-                description: 'Cookie 名（get/set/delete）',
+                description: 'Cookie 名称（get/set/delete 必填）',
+            },
+            domain: {
+                type: 'string',
+                description: '域名过滤（get/clear）',
+            },
+            path: {
+                type: 'string',
+                description: '路径过滤（get）或设置路径（set）',
+            },
+            secure: {
+                type: 'boolean',
+                description: '只返回 secure cookies（get）或设置 secure 属性（set）',
+            },
+            session: {
+                type: 'boolean',
+                description: '只返回会话 cookies（get）',
             },
+            // set 专用参数
             value: {
                 type: 'string',
                 description: 'Cookie 值（set）',
             },
-            options: {
-                type: 'object',
-                properties: {
-                    domain: { type: 'string' },
-                    path: { type: 'string' },
-                    expires: { type: 'number' },
-                    httpOnly: { type: 'boolean' },
-                    secure: { type: 'boolean' },
-                    sameSite: { type: 'string', enum: ['Strict', 'Lax', 'None'] },
-                },
-                description: 'Cookie 选项（set）',
+            httpOnly: {
+                type: 'boolean',
+                description: 'httpOnly 属性（set）',
+            },
+            sameSite: {
+                type: 'string',
+                enum: ['Strict', 'Lax', 'None'],
+                description: 'SameSite 属性（set）',
+            },
+            expirationDate: {
+                type: 'number',
+                description: '过期时间戳（set）',
             },
+            // 输出
             output: {
                 type: 'string',
                 description: '输出文件路径（get）。若指定，cookies 导出为 JSON 文件',
@@ -57,18 +81,19 @@ export const cookiesToolDefinition = {
  */
 const cookiesSchema = z.object({
     action: z.enum(['get', 'set', 'delete', 'clear']),
+    // 通用过滤参数
+    url: z.string().optional(),
     name: z.string().optional(),
+    domain: z.string().optional(),
+    path: z.string().optional(),
+    secure: z.boolean().optional(),
+    session: z.boolean().optional(),
+    // set 专用参数
     value: z.string().optional(),
-    options: z
-        .object({
-        domain: z.string().optional(),
-        path: z.string().optional(),
-        expires: z.number().optional(),
-        httpOnly: z.boolean().optional(),
-        secure: z.boolean().optional(),
-        sameSite: z.enum(['Strict', 'Lax', 'None']).optional(),
-    })
-        .optional(),
+    httpOnly: z.boolean().optional(),
+    sameSite: z.enum(['Strict', 'Lax', 'None']).optional(),
+    expirationDate: z.number().optional(),
+    // 输出
     output: z.string().optional(),
 });
 /**
@@ -77,16 +102,26 @@ const cookiesSchema = z.object({
 export async function handleCookies(params) {
     try {
         const args = cookiesSchema.parse(params);
-        const session = getSession();
+        const unifiedSession = getUnifiedSession();
         switch (args.action) {
             case 'get': {
-                const cookies = await session.getCookies();
-                // 如果指定了 name，只返回匹配的 cookie
-                const result = args.name
-                    ? cookies.filter((c) => c.name === args.name)
-                    : cookies;
+                // 构建过滤条件
+                const filter = {};
+                if (args.url)
+                    filter.url = args.url;
+                if (args.name)
+                    filter.name = args.name;
+                if (args.domain)
+                    filter.domain = args.domain;
+                if (args.path)
+                    filter.path = args.path;
+                if (args.secure !== undefined)
+                    filter.secure = args.secure;
+                if (args.session !== undefined)
+                    filter.session = args.session;
+                const cookies = await unifiedSession.getCookies(filter);
                 if (args.output) {
-                    await writeFile(args.output, JSON.stringify(result, null, 2), 'utf-8');
+                    await writeFile(args.output, JSON.stringify(cookies, null, 2), 'utf-8');
                     return {
                         content: [
                             {
@@ -95,7 +130,7 @@ export async function handleCookies(params) {
                                     success: true,
                                     action: 'get',
                                     output: args.output,
-                                    count: result.length,
+                                    count: cookies.length,
                                 }),
                             },
                         ],
@@ -108,13 +143,30 @@ export async function handleCookies(params) {
                             text: JSON.stringify({
                                 success: true,
                                 action: 'get',
-                                cookies: result,
+                                count: cookies.length,
+                                cookies,
                             }, null, 2),
                         },
                     ],
                 };
             }
             case 'set': {
+                if (!args.url) {
+                    return {
+                        content: [
+                            {
+                                type: 'text',
+                                text: JSON.stringify({
+                                    error: {
+                                        code: 'INVALID_ARGUMENT',
+                                        message: '设置 cookie 需要 url 参数',
+                                    },
+                                }),
+                            },
+                        ],
+                        isError: true,
+                    };
+                }
                 if (!args.name) {
                     return {
                         content: [
@@ -147,7 +199,15 @@ export async function handleCookies(params) {
                         isError: true,
                     };
                 }
-                await session.setCookie(args.name, args.value, args.options);
+                await unifiedSession.setCookie(args.name, args.value, {
+                    url: args.url,
+                    domain: args.domain,
+                    path: args.path,
+                    secure: args.secure,
+                    httpOnly: args.httpOnly,
+                    sameSite: args.sameSite,
+                    expirationDate: args.expirationDate,
+                });
                 return {
                     content: [
                         {
@@ -155,6 +215,7 @@ export async function handleCookies(params) {
                             text: JSON.stringify({
                                 success: true,
                                 action: 'set',
+                                url: args.url,
                                 name: args.name,
                             }),
                         },
@@ -162,6 +223,22 @@ export async function handleCookies(params) {
                 };
             }
             case 'delete': {
+                if (!args.url) {
+                    return {
+                        content: [
+                            {
+                                type: 'text',
+                                text: JSON.stringify({
+                                    error: {
+                                        code: 'INVALID_ARGUMENT',
+                                        message: '删除 cookie 需要 url 参数',
+                                    },
+                                }),
+                            },
+                        ],
+                        isError: true,
+                    };
+                }
                 if (!args.name) {
                     return {
                         content: [
@@ -178,7 +255,7 @@ export async function handleCookies(params) {
                         isError: true,
                     };
                 }
-                await session.deleteCookie(args.name);
+                await unifiedSession.deleteCookie(args.url, args.name);
                 return {
                     content: [
                         {
@@ -186,6 +263,7 @@ export async function handleCookies(params) {
                             text: JSON.stringify({
                                 success: true,
                                 action: 'delete',
+                                url: args.url,
                                 name: args.name,
                             }),
                         },
@@ -193,7 +271,13 @@ export async function handleCookies(params) {
                 };
             }
             case 'clear': {
-                await session.clearCookies();
+                // 构建过滤条件
+                const filter = {};
+                if (args.url)
+                    filter.url = args.url;
+                if (args.domain)
+                    filter.domain = args.domain;
+                const result = await unifiedSession.clearCookies(Object.keys(filter).length > 0 ? filter : undefined);
                 return {
                     content: [
                         {
@@ -201,6 +285,8 @@ export async function handleCookies(params) {
                             text: JSON.stringify({
                                 success: true,
                                 action: 'clear',
+                                filter: Object.keys(filter).length > 0 ? filter : 'all',
+                                count: result.count,
                             }),
                         },
                     ],

package/dist/tools/cookies.js.map

@@ -1 +1 @@
-{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAA;AACrB,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAC,MAAM,kBAAkB,CAAA;AAEvE;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACjC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE;QACT,IAAI,EAAE,QAAiB;QACvB,UAAU,EAAE;YACR,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC;gBACvC,WAAW,EAAE,MAAM;aACtB;YACD,oBAAoB;YACpB,GAAG,EAAE;gBACD,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,8BAA8B;aAC9C;YACD,IAAI,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,8BAA8B;aAC9C;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,iBAAiB;aACjC;YACD,IAAI,EAAE;gBACF,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,qBAAqB;aACrC;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,2CAA2C;aAC3D;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,oBAAoB;aACpC;YACD,WAAW;YACX,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,eAAe;aAC/B;YACD,QAAQ,EAAE;gBACN,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,kBAAkB;aAClC;YACD,QAAQ,EAAE;gBACN,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC;gBAC/B,WAAW,EAAE,kBAAkB;aAClC;YACD,cAAc,EAAE;gBACZ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,YAAY;aAC5B;YACD,KAAK;YACL,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,qCAAqC;aACrD;SACJ;QACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;KACvB;CACJ,CAAA;AAED;;GAEG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,SAAS;IACT,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC9B,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC/B,WAAW;IACX,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE;IACtD,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,KAAK;IACL,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAChC,CAAC,CAAA;AAIF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAe;IAI/C,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAA;QAE1C,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,KAAK,KAAK,CAAC,CAAC,CAAC;gBACT,SAAS;gBACT,MAAM,MAAM,GAOR,EAAE,CAAA;gBACN,IAAI,IAAI,CAAC,GAAG;oBAAE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;gBACnC,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;gBACtC,IAAI,IAAI,CAAC,MAAM;oBAAE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;gBAC5C,IAAI,IAAI,CAAC,IAAI;oBAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;gBACtC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;oBAAE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;gBAC1D,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;oBAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;gBAE7D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,MAAM,CAUpD,CAAA;gBAEF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;oBACvE,OAAO;wBACH,OAAO,EAAE;4BACL;gCACI,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oCACjB,OAAO,EAAE,IAAI;oCACb,MAAM,EAAE,KAAK;oCACb,MAAM,EAAE,IAAI,CAAC,MAAM;oCACnB,KAAK,EAAE,OAAO,CAAC,MAAM;iCACxB,CAAC;6BACL;yBACJ;qBACJ,CAAA;gBACL,CAAC;gBAED,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAChB;gCACI,OAAO,EAAE,IAAI;gCACb,MAAM,EAAE,KAAK;gCACb,KAAK,EAAE,OAAO,CAAC,MAAM;gCACrB,OAAO;6BACV,EACD,IAAI,EACJ,CAAC,CACJ;yBACJ;qBACJ;iBACJ,CAAA;YACL,CAAC;YAED,KAAK,KAAK,CAAC,CAAC,CAAC;gBACT,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACZ,OAAO;wBACH,OAAO,EAAE;4BACL;gCACI,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oCACjB,KAAK,EAAE;wCACH,IAAI,EAAE,kBAAkB;wCACxB,OAAO,EAAE,qBAAqB;qCACjC;iCACJ,CAAC;6BACL;yBACJ;wBACD,OAAO,EAAE,IAAI;qBAChB,CAAA;gBACL,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACb,OAAO;wBACH,OAAO,EAAE;4BACL;gCACI,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oCACjB,KAAK,EAAE;wCACH,IAAI,EAAE,kBAAkB;wCACxB,OAAO,EAAE,sBAAsB;qCAClC;iCACJ,CAAC;6BACL;yBACJ;wBACD,OAAO,EAAE,IAAI;qBAChB,CAAA;gBACL,CAAC;gBACD,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBAC3B,OAAO;wBACH,OAAO,EAAE;4BACL;gCACI,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oCACjB,KAAK,EAAE;wCACH,IAAI,EAAE,kBAAkB;wCACxB,OAAO,EAAE,uBAAuB;qCACnC;iCACJ,CAAC;6BACL;yBACJ;wBACD,OAAO,EAAE,IAAI;qBAChB,CAAA;gBACL,CAAC;gBAED,MAAM,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE;oBAClD,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,cAAc,EAAE,IAAI,CAAC,cAAc;iBACtC,CAAC,CAAA;gBAEF,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACjB,OAAO,EAAE,IAAI;gCACb,MAAM,EAAE,KAAK;gCACb,GAAG,EAAE,IAAI,CAAC,GAAG;gCACb,IAAI,EAAE,IAAI,CAAC,IAAI;6BAClB,CAAC;yBACL;qBACJ;iBACJ,CAAA;YACL,CAAC;YAED,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACZ,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACZ,OAAO;wBACH,OAAO,EAAE;4BACL;gCACI,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oCACjB,KAAK,EAAE;wCACH,IAAI,EAAE,kBAAkB;wCACxB,OAAO,EAAE,qBAAqB;qCACjC;iCACJ,CAAC;6BACL;yBACJ;wBACD,OAAO,EAAE,IAAI;qBAChB,CAAA;gBACL,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBACb,OAAO;wBACH,OAAO,EAAE;4BACL;gCACI,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oCACjB,KAAK,EAAE;wCACH,IAAI,EAAE,kBAAkB;wCACxB,OAAO,EAAE,sBAAsB;qCAClC;iCACJ,CAAC;6BACL;yBACJ;wBACD,OAAO,EAAE,IAAI;qBAChB,CAAA;gBACL,CAAC;gBAED,MAAM,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;gBAEtD,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACjB,OAAO,EAAE,IAAI;gCACb,MAAM,EAAE,QAAQ;gCAChB,GAAG,EAAE,IAAI,CAAC,GAAG;gCACb,IAAI,EAAE,IAAI,CAAC,IAAI;6BAClB,CAAC;yBACL;qBACJ;iBACJ,CAAA;YACL,CAAC;YAED,KAAK,OAAO,CAAC,CAAC,CAAC;gBACX,SAAS;gBACT,MAAM,MAAM,GAAoC,EAAE,CAAA;gBAClD,IAAI,IAAI,CAAC,GAAG;oBAAE,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;gBACnC,IAAI,IAAI,CAAC,MAAM;oBAAE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;gBAE5C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,YAAY,CAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CACtD,CAAA;gBAED,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACjB,OAAO,EAAE,IAAI;gCACb,MAAM,EAAE,OAAO;gCACf,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;gCACvD,KAAK,EAAE,MAAM,CAAC,KAAK;6BACtB,CAAC;yBACL;qBACJ;iBACJ,CAAA;YACL,CAAC;YAED;gBACI,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACjB,KAAK,EAAE;oCACH,IAAI,EAAE,kBAAkB;oCACxB,OAAO,EAAE,SAAS,IAAI,CAAC,MAAM,EAAE;iCAClC;6BACJ,CAAC;yBACL;qBACJ;oBACD,OAAO,EAAE,IAAI;iBAChB,CAAA;QACT,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC;AACL,CAAC"}

package/dist/tools/evaluate.d.ts

@@ -28,6 +28,21 @@ export declare const evaluateToolDefinition: {
                 type: string;
                 description: string;
             };
+            mode: {
+                type: string;
+                enum: string[];
+                description: string;
+            };
+            tabId: {
+                type: string;
+                description: string;
+            };
+            frame: {
+                oneOf: {
+                    type: string;
+                }[];
+                description: string;
+            };
         };
         required: string[];
     };

package/dist/tools/evaluate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;CAyBlC,CAAA;AAcD;;GAEG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC3D,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC,CA4CD"}
+{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsClC,CAAA;AAeD;;GAEG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC3D,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC,CAkFD"}

package/dist/tools/evaluate.js

@@ -3,9 +3,12 @@
  *
  * 在页面上下文执行 JavaScript
  */
+import { randomUUID } from 'crypto';
 import { writeFile } from 'fs/promises';
+import { tmpdir } from 'os';
+import { join } from 'path';
 import { z } from 'zod';
-import { formatErrorResponse, getSession } from '../core/index.js';
+import { formatErrorResponse, getUnifiedSession } from '../core/index.js';
 /**
  * evaluate 工具定义
  */
@@ -21,15 +24,28 @@ export const evaluateToolDefinition = {
             },
             args: {
                 type: 'array',
-                description: '传递给脚本的参数',
+                description: '传递给脚本的参数。使用时 script 必须是函数表达式，如 "(x, y) => x + y"，参数通过 IIFE 调用传入',
             },
             output: {
                 type: 'string',
-                description: '输出文件路径（可选）。若指定，结果序列化为 JSON 写入文件',
+                description: '输出文件路径（可选）。若指定，字符串结果直接写入原始文本，其他类型序列化为 JSON',
             },
             timeout: {
                 type: 'number',
-                description: '脚本执行超时',
+                description: '超时（毫秒）。Extension 模式作为端到端预算（含传输）；CDP 模式作为脚本执行超时',
+            },
+            mode: {
+                type: 'string',
+                enum: ['stealth', 'precise'],
+                description: '执行模式。precise（默认）使用 debugger API，可绕过 CSP；stealth 使用 JS 注入，不触发调试提示但受 CSP 限制',
+            },
+            tabId: {
+                type: 'string',
+                description: '目标 Tab ID（可选，仅 Extension 模式）。不指定则使用当前 attach 的 tab。可操作非当前 attach 的 tab。CDP 模式下忽略此参数',
+            },
+            frame: {
+                oneOf: [{ type: 'string' }, { type: 'number' }],
+                description: 'iframe 定位（可选，仅 Extension 模式）。CSS 选择器（如 "iframe#main"）或索引（如 0）。不指定则在主框架执行',
             },
         },
         required: ['script'],
@@ -43,6 +59,9 @@ const evaluateSchema = z.object({
     args: z.array(z.unknown()).optional(),
     output: z.string().optional(),
     timeout: z.number().optional(),
+    mode: z.enum(['stealth', 'precise']).optional(),
+    tabId: z.string().optional(),
+    frame: z.union([z.string(), z.number()]).optional(),
 });
 /**
  * evaluate 工具处理器
@@ -50,35 +69,80 @@ const evaluateSchema = z.object({
 export async function handleEvaluate(params) {
     try {
         const args = evaluateSchema.parse(params);
-        const session = getSession();
-        const result = await session.evaluate(args.script, args.args, args.timeout);
-        if (args.output) {
-            await writeFile(args.output, JSON.stringify(result, null, 2), 'utf-8');
+        const unifiedSession = getUnifiedSession();
+        return await unifiedSession.withTabId(args.tabId, async () => {
+            return await unifiedSession.withFrame(args.frame, async () => {
+                const result = await unifiedSession.evaluate(args.script, args.mode, args.timeout, args.args);
+                const normalizedResult = result === undefined ? null : result;
+                if (args.output) {
+                    // string 类型直接写入原始文本，其他类型 JSON 序列化
+                    const content = typeof result === 'string' ? result : JSON.stringify(normalizedResult, null, 2);
+                    await writeFile(args.output, content, 'utf-8');
+                    return {
+                        content: [
+                            {
+                                type: 'text',
+                                text: JSON.stringify({
+                                    success: true,
+                                    output: args.output,
+                                }),
+                            },
+                        ],
+                    };
+                }
+                const serialized = JSON.stringify({ success: true, result: normalizedResult }, null, 2);
+                // 检测结果大小，超过 100KB 自动保存到文件
+                if (serialized.length > 100_000) {
+                    const suffix = typeof result === 'string' ? 'txt' : 'json';
+                    const tmpPath = join(tmpdir(), `mcp-chrome-eval-${randomUUID()}.${suffix}`);
+                    const fileContent = typeof result === 'string' ? result : JSON.stringify(normalizedResult, null, 2);
+                    await writeFile(tmpPath, fileContent, 'utf-8');
+                    return {
+                        content: [
+                            {
+                                type: 'text',
+                                text: JSON.stringify({
+                                    success: true,
+                                    autoSaved: true,
+                                    path: tmpPath,
+                                    size: fileContent.length,
+                                    hint: '结果过大已自动保存到文件，请使用 Read 工具读取',
+                                }),
+                            },
+                        ],
+                    };
+                }
+                return {
+                    content: [
+                        {
+                            type: 'text',
+                            text: serialized,
+                        },
+                    ],
+                };
+            });
+        }); // withTabId
+    }
+    catch (error) {
+        // 检测 CSP 错误，提示使用 precise 模式
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (errorMessage.includes('CSP') || errorMessage.includes('Content Security Policy') || errorMessage.includes('unsafe-eval')) {
             return {
                 content: [
                     {
                         type: 'text',
                         text: JSON.stringify({
-                            success: true,
-                            output: args.output,
+                            error: {
+                                code: 'CSP_BLOCKED',
+                                message: 'CSP 限制：此页面禁止动态代码执行',
+                                suggestion: '请添加 mode="precise" 参数使用 debugger API 绕过 CSP（会显示调试提示）',
+                            },
                         }),
                     },
                 ],
+                isError: true,
             };
         }
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: JSON.stringify({
-                        success: true,
-                        result,
-                    }, null, 2),
-                },
-            ],
-        };
-    }
-    catch (error) {
         return formatErrorResponse(error);
     }
 }

package/dist/tools/evaluate.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAA;AACrB,OAAO,EAAC,mBAAmB,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAEhE;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IAClC,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,qBAAqB;IAClC,WAAW,EAAE;QACT,IAAI,EAAE,QAAiB;QACvB,UAAU,EAAE;YACR,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,eAAe;aAC/B;YACD,IAAI,EAAE;gBACF,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,UAAU;aAC1B;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,iCAAiC;aACjD;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,QAAQ;aACxB;SACJ;QACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;KACvB;CACJ,CAAA;AAED;;GAEG;AACH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACI,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACrC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAA;AAIlC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAe;IAIhD,IAAI,CAAC;QACD,MAAM,IAAI,GAAM,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;QAE5B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAE3E,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,MAAM,SAAS,CACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAC/B,OAAO,CACV,CAAA;YACD,OAAO;gBACH,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;4BACI,OAAO,EAAE,IAAI;4BACb,MAAM,EAAE,IAAI,CAAC,MAAM;yBACtB,CAAC;qBAC1B;iBACJ;aACJ,CAAA;QACL,CAAC;QAED,OAAO;YACH,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAChB;wBACI,OAAO,EAAE,IAAI;wBACb,MAAM;qBACT,EACD,IAAI,EACJ,CAAC,CACJ;iBACJ;aACJ;SACJ,CAAA;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC;AACL,CAAC"}
+{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"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"}

package/dist/tools/extract.d.ts

@@ -144,6 +144,26 @@ export declare const extractToolDefinition: {
                     };
                     readonly required: readonly ["css"];
                     readonly additionalProperties: false;
+                }, {
+                    readonly type: "object";
+                    readonly title: "CSS + 文本组合定位";
+                    readonly description: "通过 CSS 选择器 + 文本内容组合定位（先 CSS 筛选，再按文本过滤）";
+                    readonly properties: {
+                        readonly css: {
+                            readonly type: "string";
+                            readonly description: "CSS 选择器";
+                        };
+                        readonly text: {
+                            readonly type: "string";
+                            readonly description: "文本内容";
+                        };
+                        readonly exact: {
+                            readonly type: "boolean";
+                            readonly description: "是否精确匹配（默认 false）";
+                        };
+                    };
+                    readonly required: readonly ["css", "text"];
+                    readonly additionalProperties: false;
                 }, {
                     readonly type: "object";
                     readonly title: "XPath 定位";
@@ -182,11 +202,11 @@ export declare const extractToolDefinition: {
                 type: string;
                 description: string;
             };
-            selector: {
+            output: {
                 type: string;
                 description: string;
             };
-            output: {
+            tabId: {
                 type: string;
                 description: string;
             };
@@ -194,6 +214,12 @@ export declare const extractToolDefinition: {
                 type: string;
                 description: string;
             };
+            frame: {
+                oneOf: {
+                    type: string;
+                }[];
+                description: string;
+            };
         };
         required: string[];
     };

package/dist/tools/extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/tools/extract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsCjC,CAAA;AAiBD;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1D,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5F,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC,CA2MD"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/tools/extract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0CjC,CAAA;AAkBD;;GAEG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1D,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5F,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC,CAgOD"}