@pyrokine/mcp-chrome 2.3.2 → 2.4.1

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;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAqQxE;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAS5D"}
+{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAaxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AA8F3D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAE1E;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,uBAAuB,GAAG,SAAS,GAAG,uBAAuB,CAEnH;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG;IACzD,cAAc,EAAE,OAAO,CAAA;IACvB,YAAY,EAAE,QAAQ,GAAG,SAAS,CAAA;IAClC,SAAS,EAAE,OAAO,CAAA;CACrB,CAeA;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG;IACrD,cAAc,EAAE,OAAO,CAAA;IACvB,YAAY,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;IAChD,YAAY,EAAE,QAAQ,GAAG,QAAQ,CAAA;IACjC,SAAS,EAAE,OAAO,CAAA;CACrB,CAaA;AAmKD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAS5D"}

package/dist/tools/evaluate.js

@@ -6,6 +6,8 @@
 import { readFile } from 'fs/promises';
 import { z } from 'zod';
 import { CWD_PATH_PREFIX, formatErrorResponse, formatResponse, getUnifiedSession, resolveScopedInputPath, resolveScopedOutputPath, TMP_PATH_PREFIX, writePrivateFile, } from '../core/index.js';
+import { EvaluateResultTooLargeError, NonSerializableEvaluateResultError } from '../core/types.js';
+import { appendDiagnostics, finishDiagnostics, startDiagnostics } from './diagnostics.js';
 import { postConditionSchema, waitForPostCondition } from './post-condition.js';
 /**
  * evaluate 参数 schema
@@ -32,6 +34,10 @@ const evaluateSchema = z.object({
         .enum(['stealth', 'precise'])
         .optional()
         .describe('执行模式，precise（默认）使用 debugger API，可绕过 CSP；stealth 使用 JS 注入，不触发调试提示但受 CSP 限制'),
+    staleContextRetry: z
+        .enum(['never', 'readOnly'])
+        .optional()
+        .describe('iframe precise 执行遇到 stale execution context 时的重试契约；默认 never 不重放，readOnly 表示脚本无副作用并允许重新解析 context 后重放一次'),
     diagnostics: z.boolean().optional().describe('执行后返回新增 console error/warning 和失败网络请求摘要'),
     postCondition: postConditionSchema
         .optional()
@@ -45,27 +51,6 @@ const evaluateSchema = z.object({
         .optional()
         .describe('iframe 定位（可选，仅 Extension 模式），CSS 选择器（如 "iframe#main"）或索引（如 0），不指定则在主框架执行'),
 });
-async function captureDiagnosticsStart(unifiedSession) {
-    await unifiedSession.enableConsole();
-    await unifiedSession.enableNetwork();
-    const consoleLogs = await unifiedSession.getConsoleLogs();
-    const network = await unifiedSession.getNetworkRequests();
-    return { consoleCount: consoleLogs.length, networkCount: network.length };
-}
-async function captureDiagnosticsDelta(unifiedSession, start) {
-    const consoleLogs = await unifiedSession.getConsoleLogs();
-    const network = await unifiedSession.getNetworkRequests();
-    return {
-        console: consoleLogs
-            .slice(start.consoleCount)
-            .filter((item) => ['error', 'warning', 'warn'].includes(item.level))
-            .slice(-20),
-        failedRequests: network
-            .slice(start.networkCount)
-            .filter((item) => item.errorText || (item.status !== undefined && item.status >= 400))
-            .slice(-20),
-    };
-}
 function cspErrorResponse() {
     return {
         content: [
@@ -83,38 +68,61 @@ function cspErrorResponse() {
         isError: true,
     };
 }
-function appendDiagnostics(response, diagnostics) {
-    const text = response.content[0]?.text;
-    if (!text) {
-        return response;
-    }
-    try {
-        const parsed = JSON.parse(text);
-        parsed.diagnostics = diagnostics;
-        return {
-            ...response,
-            content: [{ type: 'text', text: JSON.stringify(parsed, null, 2) }],
-        };
-    }
-    catch {
-        return response;
-    }
-}
-async function formatEvaluateErrorResponse(error, unifiedSession, diagnosticsStart) {
+function formatEvaluateErrorResponse(error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    const response = errorMessage.includes('CSP') ||
+    return errorMessage.includes('CSP') ||
         errorMessage.includes('Content Security Policy') ||
         errorMessage.includes('unsafe-eval')
         ? cspErrorResponse()
         : formatErrorResponse(error);
-    if (!unifiedSession || !diagnosticsStart) {
-        return response;
+}
+export function resolveEvaluateMode(mode) {
+    return mode ?? 'precise';
+}
+export function resolveStaleContextRetryPolicy(policy) {
+    return policy ?? 'never';
+}
+export function classifyEvaluateActionError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const preActionTimeout = /tim(?:eout|ed out) before/i.test(message);
+    const timedOut = !preActionTimeout && /Request timeout|timed out|timeout|超时/i.test(message);
+    const pageEvaluationStarted = /Evaluation failed|exception|ReferenceError|TypeError|SyntaxError|RangeError|URIError|(?:^|\n)Error:/i.test(message);
+    const executionStatusUnknown = timedOut || /FRAME_STALE_CONTEXT|FRAME_EVALUATION_FAILED|Execution context became stale/i.test(message);
+    return {
+        actionExecuted: executionStatusUnknown || pageEvaluationStarted,
+        actionStatus: executionStatusUnknown ? 'unknown' : 'failed',
+        retryable: /timeout|timed out|超时|disconnect|未连接|context|debugger|attach/i.test(message),
+    };
+}
+export function classifyEvaluateFailure(error) {
+    if (error instanceof NonSerializableEvaluateResultError || error instanceof EvaluateResultTooLargeError) {
+        return {
+            actionExecuted: true,
+            actionStatus: 'completed',
+            failureStage: 'output',
+            retryable: false,
+        };
     }
+    return {
+        ...classifyEvaluateActionError(error),
+        failureStage: 'action',
+    };
+}
+function appendEvaluateFailureMetadata(response, error, verificationRequested, overrides = {}) {
+    const text = response.content[0]?.text;
+    if (!text)
+        return undefined;
     try {
-        return appendDiagnostics(response, await captureDiagnosticsDelta(unifiedSession, diagnosticsStart));
+        const payload = JSON.parse(text);
+        Object.assign(payload, classifyEvaluateFailure(error), {
+            verificationRequested,
+            verificationStatus: 'unavailable',
+            ...overrides,
+        });
+        return payload;
     }
     catch {
-        return response;
+        return undefined;
     }
 }
 async function handleEvaluate(args) {
@@ -145,59 +153,103 @@ async function handleEvaluate(args) {
         const unifiedSession = getUnifiedSession();
         return await unifiedSession.withTabId(args.tabId, async () => {
             return await unifiedSession.withFrame(args.frame, async () => {
-                const diagnosticsStart = args.diagnostics ? await captureDiagnosticsStart(unifiedSession) : undefined;
+                const diagnostics = await startDiagnostics(unifiedSession, args.diagnostics);
+                const evaluationMode = resolveEvaluateMode(args.mode);
+                const staleContextRetry = resolveStaleContextRetryPolicy(args.staleContextRetry);
+                let result;
+                let evaluationMetadata;
+                try {
+                    result = await unifiedSession.evaluate(script, evaluationMode, args.timeout, args.args, {
+                        staleContextRetry,
+                    });
+                    evaluationMetadata = unifiedSession.consumeLastEvaluationMetadata();
+                }
+                catch (error) {
+                    evaluationMetadata = unifiedSession.consumeLastEvaluationMetadata();
+                    const response = formatEvaluateErrorResponse(error);
+                    const payload = appendEvaluateFailureMetadata(response, error, Boolean(args.postCondition), {
+                        staleContextRetry,
+                        ...(evaluationMetadata ?? {}),
+                    });
+                    if (payload) {
+                        appendDiagnostics(payload, await finishDiagnostics(unifiedSession, diagnostics));
+                        response.content[0].text = JSON.stringify(payload, null, 2);
+                    }
+                    return response;
+                }
+                const normalizedResult = result === undefined ? null : result;
+                const postCondition = args.postCondition
+                    ? await waitForPostCondition(unifiedSession, args.postCondition, 'evaluate', evaluationMode)
+                    : undefined;
+                const payload = {
+                    success: postCondition ? postCondition.verificationStatus === 'matched' : true,
+                    actionExecuted: true,
+                    actionStatus: 'completed',
+                    verificationRequested: Boolean(postCondition),
+                    verificationStatus: postCondition?.verificationStatus ?? 'unavailable',
+                    failureStage: postCondition && postCondition.verificationStatus !== 'matched' ? 'verification' : undefined,
+                    retryable: postCondition?.retryable ?? false,
+                    ...(args.frame !== undefined ? { staleContextRetry } : {}),
+                    ...(evaluationMetadata ?? {}),
+                    ...(postCondition ? { postCondition } : {}),
+                };
                 try {
-                    const result = await unifiedSession.evaluate(script, args.mode, args.timeout, args.args);
-                    const normalizedResult = result === undefined ? null : result;
-                    const postCondition = args.postCondition
-                        ? await waitForPostCondition(unifiedSession, args.postCondition, 'evaluate')
-                        : undefined;
-                    const diagnostics = diagnosticsStart
-                        ? await captureDiagnosticsDelta(unifiedSession, diagnosticsStart)
-                        : undefined;
                     if (outputPath) {
-                        // string 类型直接写入原始文本，其他类型 JSON 序列化
                         const content = typeof result === 'string' ? result : JSON.stringify(normalizedResult, null, 2);
                         await writePrivateFile(outputPath, content, 'utf-8');
-                        return formatResponse({
-                            success: true,
-                            output: outputPath,
-                            ...(diagnostics ? { diagnostics } : {}),
-                            ...(postCondition ? { postCondition } : {}),
-                        });
+                        payload.output = outputPath;
                     }
-                    const serialized = JSON.stringify({ success: true, result: normalizedResult }, null, 2);
-                    // 检测结果大小，超过 100KB 自动保存到受控临时目录
-                    if (serialized.length > 100_000) {
-                        const suffix = typeof result === 'string' ? 'txt' : 'json';
-                        const autoSavedPath = (await resolveScopedOutputPath(`${TMP_PATH_PREFIX}evaluate/auto-${Date.now()}.${suffix}`, 'mcp-chrome')).absolutePath;
-                        const fileContent = typeof result === 'string' ? result : JSON.stringify(normalizedResult, null, 2);
-                        await writePrivateFile(autoSavedPath, fileContent, 'utf-8');
-                        return formatResponse({
-                            success: true,
-                            autoSaved: true,
-                            path: autoSavedPath,
-                            size: fileContent.length,
-                            hint: '结果过大已自动保存到受控临时目录，请使用 Read 工具读取',
-                            ...(diagnostics ? { diagnostics } : {}),
-                            ...(postCondition ? { postCondition } : {}),
-                        });
+                    else {
+                        const serialized = JSON.stringify(normalizedResult, null, 2);
+                        if (serialized.length > 100_000) {
+                            const suffix = typeof result === 'string' ? 'txt' : 'json';
+                            const autoSavedPath = (await resolveScopedOutputPath(`${TMP_PATH_PREFIX}evaluate/auto-${Date.now()}.${suffix}`, 'mcp-chrome')).absolutePath;
+                            const fileContent = typeof result === 'string' ? result : serialized;
+                            await writePrivateFile(autoSavedPath, fileContent, 'utf-8');
+                            Object.assign(payload, {
+                                autoSaved: true,
+                                path: autoSavedPath,
+                                size: fileContent.length,
+                                hint: '结果过大已自动保存到受控临时目录，请使用 Read 工具读取',
+                            });
+                        }
+                        else {
+                            payload.result = normalizedResult;
+                        }
                     }
-                    return formatResponse({
-                        success: true,
-                        result: normalizedResult,
-                        ...(diagnostics ? { diagnostics } : {}),
-                        ...(postCondition ? { postCondition } : {}),
-                    });
                 }
                 catch (error) {
-                    return await formatEvaluateErrorResponse(error, unifiedSession, diagnosticsStart);
+                    const response = formatEvaluateErrorResponse(error);
+                    const failurePayload = appendEvaluateFailureMetadata(response, error, Boolean(postCondition), {
+                        actionExecuted: true,
+                        actionStatus: 'completed',
+                        verificationStatus: postCondition?.verificationStatus ?? 'unavailable',
+                        failureStage: 'output',
+                        retryable: false,
+                        ...(postCondition ? { postCondition } : {}),
+                    });
+                    if (failurePayload) {
+                        appendDiagnostics(failurePayload, await finishDiagnostics(unifiedSession, diagnostics));
+                        response.content[0].text = JSON.stringify(failurePayload, null, 2);
+                    }
+                    return response;
                 }
+                appendDiagnostics(payload, await finishDiagnostics(unifiedSession, diagnostics));
+                return formatResponse(payload);
             });
         }); // withTabId
     }
     catch (error) {
-        return await formatEvaluateErrorResponse(error);
+        const response = formatEvaluateErrorResponse(error);
+        const payload = appendEvaluateFailureMetadata(response, error, Boolean(args.postCondition));
+        if (payload) {
+            payload.diagnosticsStatus = args.diagnostics ? 'unavailable' : 'disabled';
+            if (args.diagnostics) {
+                payload.diagnosticsError = 'diagnostics 未能在 tab/frame 初始化失败前启动';
+            }
+            response.content[0].text = JSON.stringify(payload, null, 2);
+        }
+        return response;
     }
 }
 /**

package/dist/tools/evaluate.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/tools/extract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAq5CxE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAS3D"}
+{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/tools/extract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AA+6CxE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAS3D"}

package/dist/tools/extract.js

@@ -16,6 +16,8 @@ import { z } from 'zod';
 import { CWD_PATH_PREFIX, formatErrorResponse, formatResponse, getSession, getUnifiedSession, resolveScopedOutputPath, TMP_PATH_PREFIX, writePrivateFile, } from '../core/index.js';
 import { comparePngImages, MAX_COMPARE_PIXELS, MAX_COMPARE_PNG_BYTES, readPngHeader } from './png.js';
 import { targetToFindParams, targetZodSchema } from './schema.js';
+import { sanitizeUrlRecords } from './network-sanitizer.js';
+import { buildTargetDiagnostics, TargetTimeoutError } from './target-diagnostics.js';
 /** 无 output 时附录返回的最大图片数 */
 const MAX_APPENDIX_IMAGES = 20;
 /**
@@ -81,18 +83,18 @@ const extractSchema = z.object({
 async function handleExtract(args) {
     try {
         const unifiedSession = getUnifiedSession();
-        const useExtension = unifiedSession.isExtensionConnected();
-        const session = getSession();
-        const frameHtmlError = validateFrameHtmlArgs(args, useExtension);
-        if (frameHtmlError) {
-            return frameHtmlError;
-        }
         // 多 tab 并行：临时切换到指定 tab
         return await unifiedSession.withTabId(args.tabId, async () => {
             return await unifiedSession.withFrame(args.frame, async () => {
+                const useExtension = unifiedSession.getMode() === 'extension';
+                const frameHtmlError = validateFrameHtmlArgs(args, useExtension);
+                if (frameHtmlError) {
+                    return frameHtmlError;
+                }
+                const session = getSession();
                 // Extension 路径：等待目标元素出现（如果指定了 target + timeout）
                 if (useExtension && args.target && args.timeout !== undefined) {
-                    await waitForTargetExtension(unifiedSession, args.target, args.timeout);
+                    await waitForTargetExtension(unifiedSession, args.target, args.timeout, args.frame);
                 }
                 return handleExtractInFrame({ unifiedSession, session, useExtension }, args);
             }); // withFrame
@@ -337,13 +339,13 @@ async function handleDomSnapshotState(unifiedSession, useExtension, args) {
     return formatResponse({ success: true, type: 'state', mode: 'domsnapshot', snapshot });
 }
 async function handleDiagnosticBundleExtract({ unifiedSession, useExtension }, args) {
-    const state = unifiedSession.getState();
+    const state = await unifiedSession.getLiveState().catch(() => null);
     const metadata = await unifiedSession.getMetadata();
     const frames = useExtension ? await unifiedSession.getFrames() : { frames: [] };
     await unifiedSession.enableConsole();
     await unifiedSession.enableNetwork();
-    const consoleLogs = await unifiedSession.getConsoleLogs();
-    const networkRequests = await unifiedSession.getNetworkRequests();
+    const consoleLogs = sanitizeUrlRecords(await unifiedSession.getConsoleLogs());
+    const networkRequests = sanitizeUrlRecords(await unifiedSession.getNetworkRequests());
     const bundle = {
         schema: 'mcp-chrome.diagnosticBundle.v1',
         url: state?.url,
@@ -1093,7 +1095,7 @@ async function extractComputedStyleExtension(unifiedSession, selector, text, xpa
  * 在 extract 操作前轮询 find()，直到找到匹配元素或超时，
  * 用于实现 extract 的 timeout 参数语义
  */
-async function waitForTargetExtension(unifiedSession, target, timeout) {
+async function waitForTargetExtension(unifiedSession, target, timeout, frame) {
     if ('x' in target && 'y' in target) {
         return;
     }
@@ -1102,20 +1104,31 @@ async function waitForTargetExtension(unifiedSession, target, timeout) {
     const { selector, text, xpath, nth: nthParam } = targetToFindParams(target);
     const nth = nthParam ?? 0;
     let lastError = null;
+    let matchCount = 0;
+    let candidates = [];
     while (true) {
         const elapsed = Date.now() - startTime;
         if (elapsed >= timeout) {
-            const msg = `等待目标元素超时 (${timeout}ms)`;
-            throw new Error(lastError ? `${msg}: ${lastError.message}` : msg);
+            throw new TargetTimeoutError(await buildTargetDiagnostics(unifiedSession, target, {
+                nth,
+                timeout,
+                frame,
+                matchCount,
+                lastState: 'attached',
+                lastError,
+                candidates,
+            }));
         }
+        const remaining = timeout - elapsed;
         if (!unifiedSession.isExtensionConnected()) {
             lastError = new Error('Extension 未连接');
-            await new Promise((r) => setTimeout(r, retryDelay));
+            await new Promise((resolve) => setTimeout(resolve, Math.min(retryDelay, remaining)));
             continue;
         }
         try {
-            const remaining = timeout - elapsed;
             const elements = await unifiedSession.find(selector, text, xpath, remaining);
+            matchCount = elements.length;
+            candidates = elements;
             if (elements.length > nth) {
                 return;
             }
@@ -1125,12 +1138,18 @@ async function waitForTargetExtension(unifiedSession, target, timeout) {
             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));
+                const retryRemaining = timeout - (Date.now() - startTime);
+                if (retryRemaining > 0) {
+                    await new Promise((resolve) => setTimeout(resolve, Math.min(retryDelay, retryRemaining)));
+                }
                 continue;
             }
             throw err;
         }
-        await new Promise((r) => setTimeout(r, retryDelay));
+        const retryRemaining = timeout - (Date.now() - startTime);
+        if (retryRemaining > 0) {
+            await new Promise((resolve) => setTimeout(resolve, Math.min(retryDelay, retryRemaining)));
+        }
     }
 }
 /**