ms-vite-plugin 1.1.7 → 1.1.8

package/dist/mcp/tools.js

@@ -303,29 +303,62 @@ function registerRuntimeTools(server) {
         return workspace;
     }
     /**
-     * 在后台启动一次日志监听，不阻塞 run/run_ui 调用返回
+     * 格式化运行期日志结果（供 run/run_ui 直接回传）
      * @param ip 设备 IP
      * @param port 设备端口
      * @param durationSeconds 监听秒数
-     * @param maxLogs 最大日志条数
-     * @returns 返回监听目标说明文本
+     * @param result 日志监听结果
+     * @returns 可拼接到 tool 响应的文本
      * @example
-     * const tip = startBackgroundLogWatch("192.168.1.10", 9800, 20, 300)
+     * const text = formatRunLogSection("192.168.1.10", 9800, 10, result)
      */
-    function startBackgroundLogWatch(ip, port, durationSeconds, maxLogs) {
-        const durationMs = durationSeconds > 0 ? durationSeconds * 1000 : 0;
-        void (0, project_1.watchDeviceLogsBySse)(ip, port, durationMs, maxLogs)
+    function formatRunLogSection(ip, port, durationSeconds, result) {
+        const logsPreview = result.logs
+            .slice(-20)
+            .map((log) => `[${log.timestamp}] [${log.level.toUpperCase()}] ${log.message}`)
+            .join("\n");
+        return [
+            `启动期日志窗口: ${durationSeconds}s（${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
+     * @param port 设备端口
+     * @param maxLogs 日志环形缓冲上限
+     * @returns 返回提示文本
+     * @example
+     * const tip = startBackgroundContinuousLogWatch("192.168.1.10", 9800, 300)
+     */
+    function startBackgroundContinuousLogWatch(ip, port, maxLogs) {
+        void (0, project_1.watchDeviceLogsBySse)(ip, port, 0, maxLogs, false)
             .then((result) => {
-            console.log(`[mcp] background logs ${ip}:${port} done, reason=${result.stopReason}, logs=${result.logs.length}, runtime_status=${result.runtimeStatus.length}`);
+            console.log(`[mcp] continuous logs ${ip}:${port} ended, reason=${result.stopReason}, logs=${result.logs.length}, runtime_status=${result.runtimeStatus.length}`);
         })
             .catch((error) => {
             const message = error instanceof Error ? error.message : String(error);
-            console.warn(`[mcp] background logs ${ip}:${port} failed: ${message}`);
+            console.warn(`[mcp] continuous logs ${ip}:${port} failed: ${message}`);
         });
-        if (durationSeconds === 0) {
-            return `已在后台启动持续日志监听: ${ip}:${port}（直到连接断开，max ${maxLogs}）`;
-        }
-        return `已在后台启动日志监听: ${ip}:${port}（${durationSeconds}s，max ${maxLogs}）`;
+        return `已切换为持续日志监听: ${ip}:${port}（直到连接断开，max ${maxLogs}）`;
     }
     /**
      * 解析运行目标：
@@ -760,14 +793,19 @@ function registerRuntimeTools(server) {
                 .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(0)
+                .min(1)
                 .max(300)
                 .optional()
-                .default(0)
-                .describe("日志监听时长（秒），默认 0；0 表示持续监听直到 runtime_status 失败或连接断开"),
+                .default(10)
+                .describe("日志监听时长（秒），默认 10，用于回传 run 启动期实时输出"),
             logMaxLogs: z
                 .number()
                 .int()
@@ -777,15 +815,25 @@ function registerRuntimeTools(server) {
                 .default(300)
                 .describe("日志最大收集条数，默认 300"),
         },
-    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath, watchLogs, logDurationSeconds, logMaxLogs, }) => {
+    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath, watchLogs, logMode, logDurationSeconds, logMaxLogs, }) => {
         const workspace = await ensureWorkspacePath(workspacePath);
-        let logNotice = "";
+        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，且不等待日志结束，避免 run 被阻塞
-                logNotice = startBackgroundLogWatch(logDevice.ip, logDevice.port, logDurationSeconds, logMaxLogs);
+                // 先挂监听，再执行 run，确保拿到启动期实时日志
+                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)}`;
@@ -811,11 +859,26 @@ function registerRuntimeTools(server) {
                 transport: "http",
                 workspacePath: workspace,
             });
-        const logSection = logNotice
-            ? `\n\n${logNotice}`
-            : logSetupWarning
-                ? `\n\n${logSetupWarning}`
-                : "";
+        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: [
                 {
@@ -869,14 +932,19 @@ function registerRuntimeTools(server) {
                 .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(0)
+                .min(1)
                 .max(300)
                 .optional()
-                .default(0)
-                .describe("日志监听时长（秒），默认 0；0 表示持续监听直到 runtime_status 失败或连接断开"),
+                .default(10)
+                .describe("日志监听时长（秒），默认 10，用于回传 run-ui 启动期实时输出"),
             logMaxLogs: z
                 .number()
                 .int()
@@ -886,15 +954,25 @@ function registerRuntimeTools(server) {
                 .default(300)
                 .describe("日志最大收集条数，默认 300"),
         },
-    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath, watchLogs, logDurationSeconds, logMaxLogs, }) => {
+    }, async ({ transport, ip, port, wsPort, wsWaitMs, workspacePath, watchLogs, logMode, logDurationSeconds, logMaxLogs, }) => {
         const workspace = await ensureWorkspacePath(workspacePath);
-        let logNotice = "";
+        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，且不等待日志结束，避免 run-ui 被阻塞
-                logNotice = startBackgroundLogWatch(logDevice.ip, logDevice.port, logDurationSeconds, logMaxLogs);
+                // 先挂监听，再执行 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)}`;
@@ -920,11 +998,26 @@ function registerRuntimeTools(server) {
                 transport: "http",
                 workspacePath: workspace,
             });
-        const logSection = logNotice
-            ? `\n\n${logNotice}`
-            : logSetupWarning
-                ? `\n\n${logSetupWarning}`
-                : "";
+        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: [
                 {

package/dist/project.d.ts

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

package/dist/project.js

@@ -515,11 +515,12 @@ function normalizeLogEntry(payload) {
  * @param port 设备端口
  * @param durationMs 监听时长（毫秒），默认 15000；传 0 表示不设超时，持续监听
  * @param maxLogs 最多收集日志条数，默认 200
+ * @param stopOnRuntimeStopped 若为 true，则在运行状态从 true 回落到 false 后结束监听
  * @returns 返回日志与运行状态
  * @example
- * const result = await watchDeviceLogsBySse("192.168.1.10", 9800, 0, 300)
+ * const result = await watchDeviceLogsBySse("192.168.1.10", 9800, 30000, 300, true)
  */
-async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200) {
+async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200, stopOnRuntimeStopped = false) {
     if (!ip.trim()) {
         throw new Error("监听日志失败: 设备 IP 不能为空");
     }
@@ -537,6 +538,7 @@ async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200)
     const runtimeStatus = [];
     const controller = new AbortController();
     let stopReason = "unknown";
+    let seenRunningStatus = false;
     const timeoutHandle = durationMs > 0
         ? setTimeout(() => {
             stopReason = "timeout";
@@ -590,6 +592,16 @@ async function watchDeviceLogsBySse(ip, port, durationMs = 15000, maxLogs = 200)
                                 raw: parsed,
                                 timestamp: new Date().toISOString(),
                             });
+                            if (parsed.isRunning === true) {
+                                seenRunningStatus = true;
+                            }
+                            if (stopOnRuntimeStopped &&
+                                seenRunningStatus &&
+                                parsed.isRunning === false) {
+                                stopReason = "runtime_stopped";
+                                controller.abort();
+                                break;
+                            }
                         }
                     }
                     catch {

package/package.json

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