ms-vite-plugin 1.4.14 → 1.4.16

package/dist/mcp/ocr-tools.js

@@ -33,13 +33,16 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.APPLE_OCR_LANGUAGES = void 0;
+exports.formatOcrToolText = formatOcrToolText;
+exports.runOcrRecognitionOnDevice = runOcrRecognitionOnDevice;
 exports.registerOcrTools = registerOcrTools;
 const fsExtra = __importStar(require("fs-extra"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const z = __importStar(require("zod/v4"));
 const tool_utils_1 = require("./tool-utils");
-const APPLE_OCR_LANGUAGES = [
+exports.APPLE_OCR_LANGUAGES = [
     "en-US",
     "fr-FR",
     "it-IT",
@@ -82,21 +85,22 @@ function resolveOcrOutputPath(outputPath) {
  * @param ey 区域右下角 y
  * @param texts 查找文本数组
  * @param languages 识别语言数组
+ * @param exactMatch 是否完整匹配文本
  * @returns 返回可交给 runScript 的 JavaScript 脚本
  * @example
  * buildAppleOcrScript("recognize", "screen", 0, 0, 0, 0)
  */
-function buildAppleOcrScript(mode, input, x, y, ex, ey, texts, languages) {
+function buildAppleOcrScript(mode, input, x, y, ex, ey, texts, languages, exactMatch = false) {
     if (mode === "findText") {
         if (!texts || texts.length === 0) {
             throw new Error("findText 模式必须传 texts。");
         }
-        return `appleOcr.findText(${jsonLiteral(input)}, ${jsonLiteral(texts)}, ${x}, ${y}, ${ex}, ${ey}, ${jsonLiteral(languages)});`;
+        return `appleOcr.findTextAbs(${jsonLiteral(input)}, ${jsonLiteral(texts)}, ${x}, ${y}, ${ex}, ${ey}, ${jsonLiteral(languages)}, ${exactMatch});`;
     }
     if (mode === "numbers") {
-        return `appleOcr.recognizeNumbers(${jsonLiteral(input)}, ${x}, ${y}, ${ex}, ${ey});`;
+        return `appleOcr.recognizeNumbersAbs(${jsonLiteral(input)}, ${x}, ${y}, ${ex}, ${ey});`;
     }
-    return `appleOcr.recognize(${jsonLiteral(input)}, ${x}, ${y}, ${ex}, ${ey}, ${jsonLiteral(languages)});`;
+    return `appleOcr.recognizeAbs(${jsonLiteral(input)}, ${x}, ${y}, ${ex}, ${ey}, ${jsonLiteral(languages)});`;
 }
 /**
  * 构建 Paddle OCR 运行脚本
@@ -108,35 +112,22 @@ function buildAppleOcrScript(mode, input, x, y, ex, ey, texts, languages) {
  * @param ey 区域右下角 y
  * @param texts 查找文本数组
  * @param confidenceThreshold 置信度阈值
- * @param maxSideLen 模型最大边长
- * @param useGpu 是否使用 GPU
+ * @param exactMatch 是否完整匹配文本
  * @returns 返回可交给 runScript 的 JavaScript 脚本
  * @example
  * buildPaddleOcrScript("recognize", "screen", 0, 0, 0, 0)
  */
-function buildPaddleOcrScript(mode, input, x, y, ex, ey, texts, confidenceThreshold, maxSideLen, useGpu) {
+function buildPaddleOcrScript(mode, input, x, y, ex, ey, texts, confidenceThreshold, exactMatch) {
     if (mode === "numbers") {
         throw new Error("PaddleOCR 文档未提供 numbers 模式，请使用 appleocr 引擎。");
     }
-    const loadScript = `const __loaded = paddleOcr.loadV5(${maxSideLen}, ${useGpu});`;
-    const loadFailedScript = 'let __ocrResult; if (!__loaded) { __ocrResult = { success: false, error: "PaddleOCR loadV5 failed" }; }';
     if (mode === "findText") {
         if (!texts || texts.length === 0) {
             throw new Error("findText 模式必须传 texts。");
         }
-        return [
-            loadScript,
-            loadFailedScript,
-            `if (__loaded) { __ocrResult = paddleOcr.findText(${jsonLiteral(input)}, ${jsonLiteral(texts)}, ${x}, ${y}, ${ex}, ${ey}, ${confidenceThreshold}); }`,
-            "__ocrResult;",
-        ].join("\n");
+        return `paddleOcr.findTextAbs(${jsonLiteral(input)}, ${jsonLiteral(texts)}, ${x}, ${y}, ${ex}, ${ey}, ${confidenceThreshold}, ${exactMatch});`;
     }
-    return [
-        loadScript,
-        loadFailedScript,
-        `if (__loaded) { __ocrResult = paddleOcr.recognize(${jsonLiteral(input)}, ${x}, ${y}, ${ex}, ${ey}, ${confidenceThreshold}); }`,
-        "__ocrResult;",
-    ].join("\n");
+    return `paddleOcr.recognizeAbs(${jsonLiteral(input)}, ${x}, ${y}, ${ex}, ${ey}, ${confidenceThreshold});`;
 }
 /**
  * 构建 OCR 运行脚本
@@ -150,17 +141,16 @@ function buildPaddleOcrScript(mode, input, x, y, ex, ey, texts, confidenceThresh
  * @param texts 查找文本数组
  * @param languages Apple OCR 识别语言数组
  * @param confidenceThreshold PaddleOCR 置信度阈值
- * @param paddleMaxSideLen PaddleOCR 模型最大边长
- * @param paddleUseGpu PaddleOCR 是否使用 GPU
+ * @param exactMatch 是否完整匹配文本
  * @returns 返回可交给 runScript 的 JavaScript 脚本
  * @example
  * buildOcrScript("appleocr", "recognize", "screen", 0, 0, 0, 0)
  */
-function buildOcrScript(engine, mode, input, x, y, ex, ey, texts, languages, confidenceThreshold, paddleMaxSideLen, paddleUseGpu) {
+function buildOcrScript(engine, mode, input, x, y, ex, ey, texts, languages, confidenceThreshold, exactMatch) {
     if (engine === "paddleocr") {
-        return buildPaddleOcrScript(mode, input, x, y, ex, ey, texts, confidenceThreshold, paddleMaxSideLen, paddleUseGpu);
+        return buildPaddleOcrScript(mode, input, x, y, ex, ey, texts, confidenceThreshold, exactMatch);
     }
-    return buildAppleOcrScript(mode, input, x, y, ex, ey, texts, languages);
+    return buildAppleOcrScript(mode, input, x, y, ex, ey, texts, languages, exactMatch);
 }
 /**
  * 调用设备 runScript 接口
@@ -242,6 +232,24 @@ async function formatOcrToolText(response, outputPath) {
         responseText,
     ].join("\n");
 }
+/**
+ * 在指定 HTTP 设备上执行 OCR 识别
+ * @param target 设备 HTTP 地址
+ * @param options OCR 参数
+ * @returns 返回 HTTP 状态码、原始结果与格式化文本
+ * @example
+ * await runOcrRecognitionOnDevice({ ip: "192.168.1.10", port: "9800" }, options)
+ */
+async function runOcrRecognitionOnDevice(target, options) {
+    const script = buildOcrScript(options.engine, options.mode, options.input, options.x, options.y, options.ex, options.ey, options.texts, options.languages, options.confidenceThreshold, options.exactMatch);
+    const response = await callRunScript(target.ip, target.port, script, options.timeoutMs);
+    const text = await formatOcrToolText(response.body, options.outputPath);
+    return {
+        status: response.status,
+        body: response.body,
+        text,
+    };
+}
 /**
  * 注册 OCR MCP 工具
  * @param server MCP 服务实例
@@ -252,7 +260,7 @@ async function formatOcrToolText(response, outputPath) {
 function registerOcrTools(server) {
     server.registerTool("ocr_recognize", {
         title: "OCR Recognize",
-        description: "通过设备 POST /api/runScript 执行快点JS OCR。支持 appleocr 与 paddleocr，默认 appleocr；OCR 没有独立 HTTP 接口时使用本工具。",
+        description: "在当前默认设备执行 OCR。支持 appleocr 与 paddleocr，默认 appleocr；返回坐标使用绝对坐标。",
         inputSchema: {
             engine: z
                 .enum(["appleocr", "paddleocr"])
@@ -291,9 +299,14 @@ function registerOcrTools(server) {
                 .optional()
                 .describe("findText 模式要查找的文本数组"),
             languages: z
-                .array(z.enum(APPLE_OCR_LANGUAGES))
+                .array(z.enum(exports.APPLE_OCR_LANGUAGES))
                 .optional()
                 .describe('Apple OCR 识别语言数组，默认由运行时使用 ["zh-Hans", "en-US"]'),
+            exactMatch: z
+                .boolean()
+                .optional()
+                .default(false)
+                .describe("findText 模式是否要求整条识别文本完全匹配目标文本"),
             confidenceThreshold: z
                 .number()
                 .min(0)
@@ -301,19 +314,6 @@ function registerOcrTools(server) {
                 .optional()
                 .default(0.6)
                 .describe("PaddleOCR 置信度阈值，默认 0.6"),
-            paddleMaxSideLen: z
-                .number()
-                .int()
-                .min(32)
-                .max(4096)
-                .optional()
-                .default(640)
-                .describe("PaddleOCR loadV5 最大边长，默认 640"),
-            paddleUseGpu: z
-                .boolean()
-                .optional()
-                .default(false)
-                .describe("PaddleOCR loadV5 是否使用 GPU，默认 false"),
             outputPath: z
                 .string()
                 .min(1)
@@ -328,20 +328,31 @@ function registerOcrTools(server) {
                 .default(60000)
                 .describe("runScript 请求超时时间，默认 60000 毫秒"),
         },
-    }, async ({ engine, mode, input, x, y, ex, ey, texts, languages, confidenceThreshold, paddleMaxSideLen, paddleUseGpu, outputPath, timeoutMs, }) => {
+    }, async ({ engine, mode, input, x, y, ex, ey, texts, languages, exactMatch, confidenceThreshold, outputPath, timeoutMs, }) => {
         const target = await (0, tool_utils_1.resolveRuntimeHttpTarget)();
-        const script = buildOcrScript(engine, mode, input, x, y, ex, ey, texts, languages, confidenceThreshold, paddleMaxSideLen, paddleUseGpu);
-        const response = await callRunScript(target.ip, target.port, script, timeoutMs);
-        const text = await formatOcrToolText(response.body, outputPath);
+        const response = await runOcrRecognitionOnDevice(target, {
+            engine,
+            mode,
+            input,
+            x,
+            y,
+            ex,
+            ey,
+            texts,
+            languages,
+            confidenceThreshold,
+            exactMatch,
+            outputPath,
+            timeoutMs,
+        });
         return (0, tool_utils_1.createTextToolResult)([
-            text,
+            response.text,
             "",
             `device: ${target.label}`,
             `engine: ${engine}`,
             `mode: ${mode}`,
             `input: ${input}`,
             `region: x=${x}, y=${y}, ex=${ex}, ey=${ey}`,
-            `runScript: POST /api/runScript`,
             `status: ${response.status}`,
         ].join("\n"), response.body.success === false);
     });

package/dist/mcp/runtime-tools.js

@@ -142,13 +142,7 @@ function registerRuntimeTools(server) {
         },
     }, async ({ ip, port }) => {
         const config = await (0, device_config_1.setDeviceConfig)(ip, port);
-        const reusedSubscription = (0, device_log_1.ensureDeviceLogSubscription)(config.ip, config.port);
-        return (0, tool_utils_1.createTextToolResult)([
-            `默认设备已设置为 ${config.ip}:${config.port}`,
-            reusedSubscription
-                ? "SSE 日志后台订阅已复用现有连接"
-                : `SSE 日志后台订阅已启动，内存缓存上限 ${device_log_1.DEVICE_LOG_MEMORY_LIMIT} 条`,
-        ].join("\n"));
+        return (0, tool_utils_1.createTextToolResult)(`默认设备已设置为 ${config.ip}:${config.port}`);
     });
     server.registerTool("get_device", {
         title: "Get Device",
@@ -191,7 +185,7 @@ function registerRuntimeTools(server) {
     });
     server.registerTool("get_node_source", {
         title: "Get Node Source",
-        description: "获取当前默认设备页面节点 XML（/api/source），写入文件后返回路径，避免长文本响应被截断。",
+        description: "获取当前默认设备页面节点 XML，写入文件后返回路径，避免长文本响应被截断。",
         inputSchema: {
             maxDepth: z
                 .number()
@@ -209,24 +203,32 @@ function registerRuntimeTools(server) {
                 .optional()
                 .default(120)
                 .describe("设备端节点抓取超时秒数，默认 120"),
+            mode: z
+                .number()
+                .int()
+                .min(1)
+                .max(2)
+                .optional()
+                .default(1)
+                .describe("节点抓取模式：1=完整节点树，2=可见节点优化模式"),
             outputPath: z
                 .string()
                 .min(1)
                 .optional()
                 .describe("可选输出文件路径，不传则写入系统临时目录"),
         },
-    }, async ({ maxDepth, timeout, outputPath }) => {
+    }, async ({ maxDepth, timeout, mode, outputPath }) => {
         const target = await (0, tool_utils_1.resolveRuntimeHttpTarget)();
         const requestOptions = (0, tool_utils_1.createRuntimeHttpRequestOptions)(target);
-        const source = await (0, project_1.getSourceOnDevice)(requestOptions, maxDepth, timeout);
+        const source = await (0, project_1.getSourceOnDevice)(requestOptions, maxDepth, timeout, mode);
         const targetPath = resolveOutputPath(outputPath, "ms-mcp-node-source", "xml");
         await fsExtra.ensureDir(path.dirname(targetPath));
         await fsExtra.writeFile(targetPath, source, "utf8");
-        return (0, tool_utils_1.createTextToolResult)(`节点获取成功: ${target.label}\nmaxDepth: ${maxDepth}\ntimeout: ${timeout}\npath: ${targetPath}\nsize: ${Buffer.byteLength(source, "utf8")} bytes`);
+        return (0, tool_utils_1.createTextToolResult)(`节点获取成功: ${target.label}\nmaxDepth: ${maxDepth}\ntimeout: ${timeout}\nmode: ${mode}\npath: ${targetPath}\nsize: ${Buffer.byteLength(source, "utf8")} bytes`);
     });
     server.registerTool("get_logs", {
         title: "Get Device Logs",
-        description: "获取当前默认设备的日志缓存快照。调用 set_device 后会自动建立 SSE 后台订阅，此工具只返回当前已缓存的日志内容。",
+        description: "获取当前默认设备的最新日志行。",
         inputSchema: {
             limit: z
                 .number()
@@ -236,19 +238,10 @@ function registerRuntimeTools(server) {
                 .optional()
                 .default(200)
                 .describe("返回最近日志条数，默认 200，最大 5000"),
-            runtimeStatusLimit: z
-                .number()
-                .int()
-                .min(0)
-                .max(200)
-                .optional()
-                .default(20)
-                .describe("返回最近 runtime_status 条数，默认 20"),
         },
-    }, async ({ limit, runtimeStatusLimit }) => {
+    }, async ({ limit }) => {
         const target = await (0, tool_utils_1.resolveRuntimeHttpTarget)();
-        (0, device_log_1.ensureDeviceLogSubscription)(target.ip, Number.parseInt(target.port, 10));
-        return (0, tool_utils_1.createTextToolResult)((0, device_log_1.buildDeviceLogSnapshotText)(limit, runtimeStatusLimit));
+        return (0, tool_utils_1.createTextToolResult)(await (0, device_log_1.buildDeviceLogSnapshotText)(target, limit));
     });
     server.registerTool("package_project", {
         title: "Package Project",

package/dist/mcp/tool-utils.d.ts

@@ -67,8 +67,9 @@ export declare function formatRuntimeJsonText(value: unknown): string;
  * @param title 文档标题
  * @param slug 文档 slug
  * @param index 列表序号
+ * @param filePath 文档文件绝对路径
  * @returns 返回用于列表展示的文本块
  * @example
- * formatApiDocSummary("js", "Tap", "tap", 0)
+ * formatApiDocSummary("js", "Tap", "tap", 0, "/tmp/tap.md")
  */
-export declare function formatApiDocSummary(language: ApiDocsLanguage, title: string, slug: string, index: number): string;
+export declare function formatApiDocSummary(language: ApiDocsLanguage, title: string, slug: string, index: number, filePath?: string): string;

package/dist/mcp/tool-utils.js

@@ -87,10 +87,16 @@ function formatRuntimeJsonText(value) {
  * @param title 文档标题
  * @param slug 文档 slug
  * @param index 列表序号
+ * @param filePath 文档文件绝对路径
  * @returns 返回用于列表展示的文本块
  * @example
- * formatApiDocSummary("js", "Tap", "tap", 0)
+ * formatApiDocSummary("js", "Tap", "tap", 0, "/tmp/tap.md")
  */
-function formatApiDocSummary(language, title, slug, index) {
-    return `${index + 1}. ${title}\nslug: ${slug}\nuri: ${(0, docs_service_1.getDocUri)(language, slug)}`;
+function formatApiDocSummary(language, title, slug, index, filePath) {
+    return [
+        `${index + 1}. ${title}`,
+        `slug: ${slug}`,
+        `uri: ${(0, docs_service_1.getDocUri)(language, slug)}`,
+        ...(filePath ? [`path: ${filePath}`] : []),
+    ].join("\n");
 }

package/dist/mcp/tools.js

@@ -22,7 +22,6 @@ function createMcpServer() {
         name: "ms-vite-plugin-mcp",
         version: version_1.PACKAGE_VERSION,
     });
-    (0, doc_tools_1.registerDocResources)(server);
     (0, doc_tools_1.registerDocTools)(server);
     (0, httpapi_tools_1.registerHttpApiTools)(server);
     (0, image_tools_1.registerImageTools)(server);

package/dist/project.d.ts

@@ -10,35 +10,13 @@ export interface DeviceCliOptions {
     workspacePath?: string;
 }
 /**
- * 设备日志条目
+ * 当前日志最新行接口响应
  */
-export interface DeviceLogEntry {
-    /** 日志级别，例如 debug/info/warn/error */
-    level: string;
-    /** 日志文本 */
-    message: string;
-    /** 日志时间戳（ISO 字符串） */
-    timestamp: string;
-}
-/**
- * 运行时状态条目（来自 SSE runtime_status 事件）
- */
-export interface DeviceRuntimeStatusEntry {
-    /** 原始 runtime_status 数据 */
-    raw: Record<string, unknown>;
-    /** 事件时间戳（本地接收时间） */
-    timestamp: string;
-}
-/**
- * SSE 日志监听结果
- */
-export interface DeviceLogWatchResult {
-    /** 收集到的日志条目 */
-    logs: DeviceLogEntry[];
-    /** 收集到的 runtime_status 条目 */
-    runtimeStatus: DeviceRuntimeStatusEntry[];
-    /** 监听结束原因 */
-    stopReason: "timeout" | "runtime_continuous" | "runtime_stopped" | "stream_closed" | "manual_abort" | "unknown";
+export interface CurrentLogLinesResponse {
+    /** 当前日志文件最新行，按日志原始输出顺序排列 */
+    lines: string[];
+    /** 本次返回范围前是否还有更早日志 */
+    hasMore: boolean;
 }
 /**
  * 在设备上获取截图 JPG 二进制数据（HTTP）
@@ -61,24 +39,21 @@ export declare function getScreenshotBase64OnDevice(options: DeviceCliOptions):
  * @param options 命令选项（transport 仅支持 http）
  * @param maxDepth 节点最大深度，默认 50
  * @param timeout 获取节点超时秒数，默认 120
+ * @param mode 节点抓取模式，1=完整节点树，2=可见节点优化模式
  * @returns 返回 XML 字符串
  * @example
- * const xml = await getSourceOnDevice({ ip: "192.168.1.10", port: "9800" }, 50, 120)
+ * const xml = await getSourceOnDevice({ ip: "192.168.1.10", port: "9800" }, 50, 120, 1)
  */
-export declare function getSourceOnDevice(options: DeviceCliOptions, maxDepth?: number, timeout?: number): Promise<string>;
+export declare function getSourceOnDevice(options: DeviceCliOptions, maxDepth?: number, timeout?: number, mode?: number): Promise<string>;
 /**
- * 监听设备 SSE 日志并返回原始结果
- * @param ip 设备 IP 地址
- * @param port 设备端口
- * @param durationMs 监听时长（毫秒），默认 15000；传 0 表示不设超时，持续监听
- * @param maxLogs 最多收集日志条数，默认 200
- * @param stopOnRuntimeStopped 若为 true，则在运行状态从 true 回落到 false 后结束监听
- * @param stopOnRuntimeContinuous 若为 true，则在确认持续运行态后结束监听（用于 single 模式快速返回）
- * @returns 返回日志与运行状态
+ * 在设备上获取当前日志文件最新行
+ * @param options 命令选项（仅支持 http 传输）
+ * @param count 需要读取的最新日志行数，默认 200，最大 5000
+ * @returns 返回最新日志行和是否还有更早日志
  * @example
- * const result = await watchDeviceLogsBySse("192.168.1.10", 9800, 30000, 300, true, true)
+ * const result = await getCurrentLogLinesOnDevice({ ip: "192.168.1.10", port: "9800" }, 200)
  */
-export declare function watchDeviceLogsBySse(ip: string, port: number, durationMs?: number, maxLogs?: number, stopOnRuntimeStopped?: boolean, stopOnRuntimeContinuous?: boolean): Promise<DeviceLogWatchResult>;
+export declare function getCurrentLogLinesOnDevice(options: DeviceCliOptions, count?: number): Promise<CurrentLogLinesResponse>;
 /**
  * 在设备上运行项目（先同步后运行）
  * @param options 命令选项