ms-vite-plugin 1.1.8 → 1.1.10

package/dist/mcp/tools.js

@@ -312,34 +312,18 @@ function registerRuntimeTools(server) {
      * @example
      * const text = formatRunLogSection("192.168.1.10", 9800, 10, result)
      */
-    function formatRunLogSection(ip, port, durationSeconds, result) {
+    function formatRunLogSection(ip, port, result) {
         const logsPreview = result.logs
             .slice(-20)
             .map((log) => `[${log.timestamp}] [${log.level.toUpperCase()}] ${log.message}`)
             .join("\n");
         return [
-            `启动期日志窗口: ${durationSeconds}s（${ip}:${port}）`,
+            `运行日志来源: ${ip}:${port}`,
             `结束原因: ${result.stopReason}，日志: ${result.logs.length} 条，runtime_status: ${result.runtimeStatus.length} 条`,
             "最新日志（最多展示最后20条）:",
             logsPreview || "无日志",
         ].join("\n");
     }
-    /**
-     * 提取最后一次 runtime_status 的 isRunning 值
-     * @param result 日志监听结果
-     * @returns 返回 true/false，无法判断时返回 undefined
-     * @example
-     * const running = getLatestIsRunning(result)
-     */
-    function getLatestIsRunning(result) {
-        for (let i = result.runtimeStatus.length - 1; i >= 0; i -= 1) {
-            const raw = result.runtimeStatus[i].raw;
-            if (typeof raw.isRunning === "boolean") {
-                return raw.isRunning;
-            }
-        }
-        return undefined;
-    }
     /**
      * 启动持续日志监听（后台，不阻塞当前 tool 返回）
      * @param ip 设备 IP
@@ -350,7 +334,7 @@ function registerRuntimeTools(server) {
      * const tip = startBackgroundContinuousLogWatch("192.168.1.10", 9800, 300)
      */
     function startBackgroundContinuousLogWatch(ip, port, maxLogs) {
-        void (0, project_1.watchDeviceLogsBySse)(ip, port, 0, maxLogs, false)
+        void (0, project_1.watchDeviceLogsBySse)(ip, port, 0, maxLogs)
             .then((result) => {
             console.log(`[mcp] continuous logs ${ip}:${port} ended, reason=${result.stopReason}, logs=${result.logs.length}, runtime_status=${result.runtimeStatus.length}`);
         })
@@ -791,21 +775,13 @@ function registerRuntimeTools(server) {
             watchLogs: z
                 .boolean()
                 .optional()
-                .default(true)
-                .describe("是否在运行前启动实时日志监听，默认 true"),
+                .default(false)
+                .describe("是否在运行前启动日志监听，默认 false"),
             logMode: z
-                .enum(["auto", "single", "continuous"])
+                .enum(["single", "continuous"])
                 .optional()
-                .default("auto")
-                .describe("日志模式：auto=单次优先并自动判长任务，single=按 runtime_status 收敛，continuous=持续监听"),
-            logDurationSeconds: z
-                .number()
-                .int()
-                .min(1)
-                .max(300)
-                .optional()
-                .default(10)
-                .describe("日志监听时长（秒），默认 10，用于回传 run 启动期实时输出"),
+                .default("single")
+                .describe("日志模式：single=按 runtime_status 收敛，continuous=持续监听"),
             logMaxLogs: z
                 .number()
                 .int()
@@ -815,7 +791,7 @@ function registerRuntimeTools(server) {
                 .default(300)
                 .describe("日志最大收集条数，默认 300"),
         },
-    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath, watchLogs, logMode, logDurationSeconds, logMaxLogs, }) => {
+    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath, watchLogs, logMode, logMaxLogs, }) => {
         const workspace = await ensureWorkspacePath(workspacePath);
         let logPromise;
         let logDeviceIp = "";
@@ -832,7 +808,7 @@ function registerRuntimeTools(server) {
                     logModeNotice = startBackgroundContinuousLogWatch(logDevice.ip, logDevice.port, logMaxLogs);
                 }
                 else {
-                    logPromise = (0, project_1.watchDeviceLogsBySse)(logDevice.ip, logDevice.port, logDurationSeconds * 1000, logMaxLogs, logMode === "single" || logMode === "auto");
+                    logPromise = (0, project_1.watchDeviceLogsBySse)(logDevice.ip, logDevice.port, 0, logMaxLogs, true, true);
                 }
             }
             catch (error) {
@@ -862,14 +838,9 @@ function registerRuntimeTools(server) {
         let logSection = "";
         if (logPromise) {
             const result = await logPromise;
-            const sections = [
-                formatRunLogSection(logDeviceIp, logDevicePort, logDurationSeconds, result),
-            ];
-            if (logMode === "auto") {
-                const latestIsRunning = getLatestIsRunning(result);
-                if (result.stopReason === "timeout" && latestIsRunning === true) {
-                    sections.push(startBackgroundContinuousLogWatch(logDeviceIp, logDevicePort, logMaxLogs));
-                }
+            const sections = [formatRunLogSection(logDeviceIp, logDevicePort, result)];
+            if (result.stopReason === "runtime_continuous") {
+                sections.push(startBackgroundContinuousLogWatch(logDeviceIp, logDevicePort, logMaxLogs));
             }
             logSection = `\n\n${sections.join("\n")}`;
         }
@@ -927,57 +898,9 @@ function registerRuntimeTools(server) {
                 .min(1)
                 .optional()
                 .describe("可选工作目录；不传时使用 set_workspace 记录值或 MCP 启动目录"),
-            watchLogs: z
-                .boolean()
-                .optional()
-                .default(true)
-                .describe("是否在预览前启动实时日志监听，默认 true"),
-            logMode: z
-                .enum(["auto", "single", "continuous"])
-                .optional()
-                .default("auto")
-                .describe("日志模式：auto=单次优先并自动判长任务，single=按 runtime_status 收敛，continuous=持续监听"),
-            logDurationSeconds: z
-                .number()
-                .int()
-                .min(1)
-                .max(300)
-                .optional()
-                .default(10)
-                .describe("日志监听时长（秒），默认 10，用于回传 run-ui 启动期实时输出"),
-            logMaxLogs: z
-                .number()
-                .int()
-                .min(10)
-                .max(5000)
-                .optional()
-                .default(300)
-                .describe("日志最大收集条数，默认 300"),
         },
-    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath, watchLogs, logMode, logDurationSeconds, logMaxLogs, }) => {
+    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath }) => {
         const workspace = await ensureWorkspacePath(workspacePath);
-        let logPromise;
-        let logDeviceIp = "";
-        let logDevicePort = 0;
-        let logSetupWarning = "";
-        let logModeNotice = "";
-        if (watchLogs) {
-            try {
-                const logDevice = await (0, device_config_1.resolveDeviceConfig)(ip, port);
-                // 先挂监听，再执行 run-ui，确保拿到启动期实时日志
-                logDeviceIp = logDevice.ip;
-                logDevicePort = logDevice.port;
-                if (logMode === "continuous") {
-                    logModeNotice = startBackgroundContinuousLogWatch(logDevice.ip, logDevice.port, logMaxLogs);
-                }
-                else {
-                    logPromise = (0, project_1.watchDeviceLogsBySse)(logDevice.ip, logDevice.port, logDurationSeconds * 1000, logMaxLogs, logMode === "single" || logMode === "auto");
-                }
-            }
-            catch (error) {
-                logSetupWarning = `日志监听未启动: ${error instanceof Error ? error.message : String(error)}`;
-            }
-        }
         const target = await resolvePreferredRuntimeTarget({
             transport,
             ip,
@@ -998,31 +921,11 @@ function registerRuntimeTools(server) {
                 transport: "http",
                 workspacePath: workspace,
             });
-        let logSection = "";
-        if (logPromise) {
-            const result = await logPromise;
-            const sections = [
-                formatRunLogSection(logDeviceIp, logDevicePort, logDurationSeconds, result),
-            ];
-            if (logMode === "auto") {
-                const latestIsRunning = getLatestIsRunning(result);
-                if (result.stopReason === "timeout" && latestIsRunning === true) {
-                    sections.push(startBackgroundContinuousLogWatch(logDeviceIp, logDevicePort, logMaxLogs));
-                }
-            }
-            logSection = `\n\n${sections.join("\n")}`;
-        }
-        else if (logModeNotice) {
-            logSection = `\n\n${logModeNotice}`;
-        }
-        else if (logSetupWarning) {
-            logSection = `\n\n${logSetupWarning}`;
-        }
         return {
             content: [
                 {
                     type: "text",
-                    text: `UI 预览请求已发送到 ${target.label}${logSection}`,
+                    text: `UI 预览请求已发送到 ${target.label}`,
                 },
             ],
         };

package/dist/project.d.ts

@@ -38,7 +38,7 @@ export interface DeviceLogWatchResult {
     /** 收集到的 runtime_status 条目 */
     runtimeStatus: DeviceRuntimeStatusEntry[];
     /** 监听结束原因 */
-    stopReason: "timeout" | "runtime_stopped" | "stream_closed" | "manual_abort" | "unknown";
+    stopReason: "timeout" | "runtime_continuous" | "runtime_stopped" | "stream_closed" | "manual_abort" | "unknown";
 }
 /**
  * 在设备上获取截图 JPG 二进制数据（HTTP）
@@ -73,11 +73,12 @@ export declare function getSourceOnDevice(options: DeviceCliOptions, maxDepth?:
  * @param durationMs 监听时长（毫秒），默认 15000；传 0 表示不设超时，持续监听
  * @param maxLogs 最多收集日志条数，默认 200
  * @param stopOnRuntimeStopped 若为 true，则在运行状态从 true 回落到 false 后结束监听
+ * @param stopOnRuntimeContinuous 若为 true，则在确认持续运行态后结束监听（用于 single 模式快速返回）
  * @returns 返回日志与运行状态
  * @example
- * const result = await watchDeviceLogsBySse("192.168.1.10", 9800, 30000, 300, true)
+ * const result = await watchDeviceLogsBySse("192.168.1.10", 9800, 30000, 300, true, true)
  */
-export declare function watchDeviceLogsBySse(ip: string, port: number, durationMs?: number, maxLogs?: number, stopOnRuntimeStopped?: boolean): Promise<DeviceLogWatchResult>;
+export declare function watchDeviceLogsBySse(ip: string, port: number, durationMs?: number, maxLogs?: number, stopOnRuntimeStopped?: boolean, stopOnRuntimeContinuous?: boolean): Promise<DeviceLogWatchResult>;
 /**
  * 在设备上运行项目（先同步后运行）
  * @param options 命令选项

package/dist/project.js

@@ -516,11 +516,12 @@ function normalizeLogEntry(payload) {
  * @param durationMs 监听时长（毫秒），默认 15000；传 0 表示不设超时，持续监听
  * @param maxLogs 最多收集日志条数，默认 200
  * @param stopOnRuntimeStopped 若为 true，则在运行状态从 true 回落到 false 后结束监听
+ * @param stopOnRuntimeContinuous 若为 true，则在确认持续运行态后结束监听（用于 single 模式快速返回）
  * @returns 返回日志与运行状态
  * @example
- * const result = await watchDeviceLogsBySse("192.168.1.10", 9800, 30000, 300, true)
+ * const result = await watchDeviceLogsBySse("192.168.1.10", 9800, 30000, 300, true, true)
  */
-async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200, stopOnRuntimeStopped = false) {
+async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200, stopOnRuntimeStopped = false, stopOnRuntimeContinuous = false) {
     if (!ip.trim()) {
         throw new Error("监听日志失败: 设备 IP 不能为空");
     }
@@ -539,6 +540,7 @@ async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200,
     const controller = new AbortController();
     let stopReason = "unknown";
     let seenRunningStatus = false;
+    let runningStatusCount = 0;
     const timeoutHandle = durationMs > 0
         ? setTimeout(() => {
             stopReason = "timeout";
@@ -594,6 +596,16 @@ async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200,
                             });
                             if (parsed.isRunning === true) {
                                 seenRunningStatus = true;
+                                runningStatusCount += 1;
+                                // 连续收到运行态，视为长期任务，single 模式可立即返回并转持续监听
+                                if (stopOnRuntimeContinuous && runningStatusCount >= 2) {
+                                    stopReason = "runtime_continuous";
+                                    controller.abort();
+                                    break;
+                                }
+                            }
+                            else if (parsed.isRunning === false) {
+                                runningStatusCount = 0;
                             }
                             if (stopOnRuntimeStopped &&
                                 seenRunningStatus &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ms-vite-plugin",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "type": "commonjs",
   "license": "MIT",
   "publishConfig": {