fix: 恢复双按钮(一键启动引擎+断开引擎) + 小程序测试实时步骤进度推送

Author: zcj220

extension/src/sidebarProvider.ts

@@ -1155,7 +1155,8 @@ ${commonRules}`;
       </div>
     </div>
     <div style="display:flex;gap:4px;margin-top:6px">
-      <button id="btnLaunchEngine" style="background:#22c55e;flex:1">� 一键连接</button>
+      <button id="btnLaunchEngine" style="background:#22c55e;flex:1">🚀 一键启动引擎</button>
+      <button id="btnStopEngine" class="hidden" style="background:#ef4444;flex:1">⏹ 断开引擎</button>
     </div>
   </div>
 
@@ -1528,67 +1529,54 @@ ${commonRules}`;
 
     // 检查引擎
     const btnLaunchEngine = document.getElementById("btnLaunchEngine");
+    const btnStopEngine = document.getElementById("btnStopEngine");
     let isStarting = false;  // 是否处于「正在启动中」状态
     let engineFound = false;   // 引擎是否已连接成功（防止重复检查）
-    let engineConnected = false;  // 当前是否已连接
     let launchTimeoutId = null;  // 防止多次点击导致旧 timer 覆盖按钮状态
     document.getElementById("btnCheckEngine").addEventListener("click", () => {
       vscode.postMessage({ command: "checkEngine" });
     });
 
-    // 单按钮：连接时点击=断开，断开时点击=连接
+    // 一键启动引擎
     btnLaunchEngine.addEventListener("click", () => {
-      if (engineConnected) {
-        // 已连接 → 断开
-        isStarting = false;
-        wasConnected = false;
-        engineFound = false;
-        engineConnected = false;
-        vscode.postMessage({ command: "stopEngine" });
-        btnLaunchEngine.textContent = "⏳ 断开中...";
-        btnLaunchEngine.style.background = "#6b7280";
-        btnLaunchEngine.disabled = true;
-        addLog("正在断开引擎...", "info");
-        setTimeout(() => {
-          btnLaunchEngine.textContent = "🔗 一键连接";
-          btnLaunchEngine.style.background = "#22c55e";
-          btnLaunchEngine.disabled = false;
-        }, 2000);
-      } else {
-        // 未连接 → 启动
-        isStarting = true;
-        engineFound = false;
-        vscode.postMessage({ command: "launchEngine" });
-        btnLaunchEngine.textContent = "⏳ 启动中...";
-        btnLaunchEngine.style.background = "#6b7280";
-        btnLaunchEngine.disabled = true;
-        addLog("正在启动引擎，请稍候...", "info");
-
-        // 清除旧 timer，防止多次点击互相干扰
-        if (launchTimeoutId) { clearTimeout(launchTimeoutId); launchTimeoutId = null; }
-
-        // 每 3s 检查一次，最多 8 次（24s）
-        let checkCount = 0;
-        function doCheck() {
-          if (engineFound || !isStarting) { return; }
-          checkCount++;
+      isStarting = true;
+      engineFound = false;
+      vscode.postMessage({ command: "launchEngine" });
+      btnLaunchEngine.classList.add("hidden");
+      btnStopEngine.classList.remove("hidden");
+      btnStopEngine.textContent = "⏹ 断开引擎";
+      btnStopEngine.disabled = false;
+      addLog("正在启动引擎，请稍候（最长约25秒）...", "info");
+
+      // 清除旧 timer，防止多次点击互相干扰
+      if (launchTimeoutId) { clearTimeout(launchTimeoutId); launchTimeoutId = null; }
+
+      // 分别在 8s / 16s / 25s 重试检查连接，连接成功后停止后续检查
+      const delays = [8000, 16000, 25000];
+      function scheduleCheck(idx) {
+        if (idx >= delays.length || engineFound) { return; }
+        launchTimeoutId = setTimeout(() => {
+          if (engineFound) { return; }
           vscode.postMessage({ command: "checkEngine" });
-          if (checkCount < 8) {
-            launchTimeoutId = setTimeout(doCheck, 3000);
-          } else {
-            launchTimeoutId = setTimeout(() => {
-              if (!engineFound) {
-                isStarting = false;
-                btnLaunchEngine.textContent = "🔗 一键连接";
-                btnLaunchEngine.style.background = "#22c55e";
-                btnLaunchEngine.disabled = false;
-                addLog("引擎启动超时，请检查环境后重试", "error");
-              }
-            }, 1000);
-          }
-        }
-        launchTimeoutId = setTimeout(doCheck, 3000);
+          scheduleCheck(idx + 1);
+        }, delays[idx] - (idx > 0 ? delays[idx - 1] : 0));
       }
+      scheduleCheck(0);
+    });
+
+    // 断开引擎
+    btnStopEngine.addEventListener("click", () => {
+      isStarting = false;
+      wasConnected = false;
+      engineFound = false;
+      vscode.postMessage({ command: "stopEngine" });
+      btnStopEngine.textContent = "⏳ 断开中...";
+      btnStopEngine.disabled = true;
+      addLog("正在断开引擎...", "info");
+      setTimeout(() => {
+        btnLaunchEngine.classList.remove("hidden");
+        btnStopEngine.classList.add("hidden");
+      }, 2000);
     });
 
     let pendingBlueprintRun = null;
@@ -1935,28 +1923,26 @@ ${commonRules}`;
       if (data.connected) {
         isStarting = false;
         engineFound = true;
-        engineConnected = true;
         statusDot.className = "status-dot connected";
         engineStatus.textContent = "v" + (data.version || "?");
-        btnLaunchEngine.textContent = "⏹ 断开";
-        btnLaunchEngine.style.background = "#ef4444";
-        btnLaunchEngine.disabled = false;
+        btnLaunchEngine.classList.add("hidden");
+        btnStopEngine.classList.remove("hidden");
+        btnStopEngine.textContent = "⏹ 断开引擎";
+        btnStopEngine.disabled = false;
         if (!wasConnected) {
           wasConnected = true;
           addLog("引擎连接成功 | v" + data.version, "success");
           vscode.postMessage({ command: "scanBlueprints" });
         }
       } else {
-        engineConnected = false;
         statusDot.className = "status-dot disconnected";
         engineStatus.textContent = isStarting ? "启动中..." : "未连接";
-        btnLaunchEngine.textContent = isStarting ? "⏳ 启动中..." : "🔗 一键连接";
-        btnLaunchEngine.style.background = isStarting ? "#6b7280" : "#22c55e";
-        btnLaunchEngine.disabled = isStarting;
         if (!isStarting) {
+          btnLaunchEngine.classList.remove("hidden");
+          btnStopEngine.classList.add("hidden");
           wasConnected = false;
         }
-        addLog(isStarting ? "引擎尚未就绪，继续等待..." : "引擎未连接，点击「一键连接」按钮启动", isStarting ? "warn" : "error");
+        addLog(isStarting ? "引擎尚未就绪，继续等待..." : "引擎未连接，点击「🚀 一键启动引擎」按钮启动", isStarting ? "warn" : "error");
       }
     }
 

src/api/routes.py

@@ -781,15 +781,48 @@ async def run_miniprogram_blueprint_test(req: dict) -> TestReportResponse:
             logger.info("启动Node.js执行器: {}", runner_script.name)
             start = time.time()
 
+            # 用Popen实时读取stderr进度并推送WebSocket
+            await ws_manager.send_log(f"小程序蓝本测试开始: {blueprint.app_name} | {len(all_steps)}步")
             proc = await asyncio.get_event_loop().run_in_executor(
                 None,
-                lambda: sp.run(
+                lambda: sp.Popen(
                     ["node", str(runner_script), str(tmp_file)],
-                    capture_output=True, timeout=600,
+                    stdout=sp.PIPE, stderr=sp.PIPE,
                     encoding="utf-8", errors="replace",
                 )
             )
 
+            # 实时读stderr推送步骤进度（线程读取 + 协程推送）
+            import threading
+            _stderr_buf = []
+            _stderr_done = threading.Event()
+            loop = asyncio.get_event_loop()
+
+            def _stream_stderr():
+                for line in proc.stderr:
+                    _stderr_buf.append(line.rstrip())
+                _stderr_done.set()
+
+            stderr_thread = threading.Thread(target=_stream_stderr, daemon=True)
+            stderr_thread.start()
+
+            _last_pushed = 0
+            while not _stderr_done.is_set() or _last_pushed < len(_stderr_buf):
+                await asyncio.sleep(0.3)
+                while _last_pushed < len(_stderr_buf):
+                    line = _stderr_buf[_last_pushed]
+                    _last_pushed += 1
+                    if line.startswith("[PROGRESS]"):
+                        parts = line[len("[PROGRESS]"):].strip()
+                        await ws_manager.send_step_start(0, f"🔄 {parts}")
+                    elif line.startswith("[STEP]"):
+                        parts = line[len("[STEP]"):].strip()
+                        await ws_manager.send_log(parts)
+
+            # 等Node进程结束，读取stdout
+            stdout_data = await loop.run_in_executor(None, proc.stdout.read)
+            await loop.run_in_executor(None, proc.wait)
+
             # 清理临时文件
             try:
                 tmp_file.unlink()
@@ -800,8 +833,10 @@ async def run_miniprogram_blueprint_test(req: dict) -> TestReportResponse:
             logger.info("Node.js执行器完成 | 耗时:{:.1f}秒 | rc:{}", duration, proc.returncode)
 
             # 解析结果
-            stdout = proc.stdout or ""
-            stderr = proc.stderr or ""
+            stdout = stdout_data or ""
+            stderr = "\n".join(_stderr_buf)
+
+            await ws_manager.send_log(f"小程序蓝本测试完成 | 耗时:{duration:.1f}秒")
 
             # 从stdout找JSON（最后一行）
             result_data = None
@@ -816,8 +851,8 @@ async def run_miniprogram_blueprint_test(req: dict) -> TestReportResponse:
 
             if not result_data:
                 logger.error("执行器无JSON输出:\nstdout:{}\nstderr:{}", stdout[-300:], stderr[-300:])
-                # crash时返回友好错误报告，不抛500
                 hint = ""
+                rc = proc.returncode
                 if rc and rc != 0:
                     hint = f"执行器异常退出(rc={rc})。可能原因：小程序代码修改后未重新编译，或模拟器状态异常。请在微信开发者工具中点击'编译'后重试。"
                 else:
@@ -878,6 +913,7 @@ def _to_action(s: str) -> ActionType:
             )
 
             pass_rate = passed / total * 100 if total > 0 else 0
+            await ws_manager.send_test_done(pass_rate, len(bugs))
 
             from src.api.models import StepDetail, BugDetail
             return TestReportResponse(