@aiscene/aiserver 1.6.6 → 1.6.8

package/dist/debug/websocket-server.js

@@ -229,6 +229,8 @@ export class DebugWebSocketServer {
     }
     handleControlConnection(ws) {
         logger.info('[Control] New connection');
+        // 连接建立后发送 proxy_connected 确认，供客户端（android_device_run.js）确认握手
+        this.sendMessage(ws, { type: 'proxy_connected', timestamp: new Date().toISOString() });
         // 心跳：收到 pong 标记为存活
         ws.isAlive = true;
         ws.on('pong', () => {
@@ -254,7 +256,9 @@ export class DebugWebSocketServer {
                     logger.info(`[WebSession] Client disconnected, keep browser alive for reuse: ${sessionId}`);
                     continue;
                 }
-                this.cleanupSession(sessionId);
+                this.cleanupSession(sessionId).catch((error) => {
+                    logger.warn(`[Control] Session cleanup failed: sessionId=${sessionId}, error=${error.message}`);
+                });
             }
             // 清理任务日志订阅
             this.cleanupClientSubscriptions(ws);
@@ -498,6 +502,7 @@ export class DebugWebSocketServer {
                 session.webDeviceName = request.mobileMode ? (request.deviceName || 'iPhone 13') : undefined;
                 // modelConfig 走构造参数（与 handleExecuteWebAction 一致，避免多会话相互覆盖 env）
                 session.webAgent = new midscene.PlaywrightAgent(page, {
+                    outputFormat: 'html-and-external-assets',
                     modelConfig: this.applyModelConfig(request.modelConfig),
                 });
                 // 注册并发池 + 启动 TTL 计时
@@ -665,9 +670,7 @@ export class DebugWebSocketServer {
             mobileMode: request.mobileMode,
             deviceName: request.deviceName,
             // 环境代理配置
-            environmentId: request.environmentId,
-            proxyPort: request.proxyPort || (request.hostMappings && request.hostMappings.length > 0 ? 8899 : undefined),
-            hostMappings: request.hostMappings,
+            proxyPort: request.proxyPort || 8899,
             // 公司代理平台账号
             proxyAccount: request.proxyAccount,
             // 添加登录配置
@@ -682,38 +685,13 @@ export class DebugWebSocketServer {
                 agreementSelector: request.loginConfig.agreementSelector,
             }),
         };
-        // Setup proxy rules: 如果有 proxyAccount，使用公司代理平台；否则走本地 Whistle
-        const whistleApiBase = config.proxyAccount ? `http://proxy-pc.jd.com/account/${config.proxyAccount}` : undefined;
-        if (config.hostMappings && config.hostMappings.length > 0) {
-            try {
-                const envId = config.environmentId || sessionId;
-                const ruleGroupName = whistleManager.generateRuleGroupName(envId);
-                const success = await whistleManager.createRuleGroup(ruleGroupName, config.hostMappings, whistleApiBase);
-                if (success) {
-                    const sess = sessionManager.get(sessionId);
-                    if (sess) {
-                        sess.whistleRuleGroupName = ruleGroupName;
-                        sess.whistleApiBase = whistleApiBase;
-                    }
-                    if (!config.proxyAccount && !config.proxyPort)
-                        config.proxyPort = 8899;
-                    logger.info('[Debug] Whistle proxy setup: ruleGroup=' + ruleGroupName + ', proxyPort=' + config.proxyPort + ', proxyAccount=' + (config.proxyAccount || 'N/A'));
-                    // 开始请求抓包（传入 proxyAccount，自动选择正确的 Whistle 实例）
-                    try {
-                        await whistleManager.startCapture(sessionId, undefined, 3000, config.proxyAccount);
-                        logger.info('[Debug] Whistle request capture started: sessionId=' + sessionId);
-                    }
-                    catch (captureErr) {
-                        logger.warn('[Debug] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
-                    }
-                }
-                else {
-                    logger.warn('[Debug] Whistle proxy setup failed, continuing without proxy');
-                }
-            }
-            catch (err) {
-                logger.warn('[Debug] Whistle proxy setup error: ' + (err instanceof Error ? err.message : String(err)));
-            }
+        // 注意：proxy-service.jd.com 的规则由前端（浏览器端）设置，后端只负责设备代理 + 抓包
+        try {
+            await whistleManager.startCapture(sessionId, undefined, 3000, config.proxyAccount);
+            logger.info('[Debug] Whistle request capture started: sessionId=' + sessionId);
+        }
+        catch (captureErr) {
+            logger.warn('[Debug] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
         }
         // 使用 AbortSignal 监听停止请求
         const executePromise = executor.execute(config);
@@ -737,7 +715,15 @@ export class DebugWebSocketServer {
             logger.info(`[executeRunCodeInProcess] Execution aborted by user, skipping result messages (handleStopDebug will send them)`);
             return;
         }
-        // 清理 executor 引用
+        // 清理 executor（释放 device/agent 资源 + 清除设备代理）
+        if (executor && typeof executor.destroy === 'function') {
+            try {
+                await executor.destroy();
+            }
+            catch (destroyErr) {
+                logger.warn(`[executeRunCodeInProcess] Executor destroy error: ${destroyErr.message}`);
+            }
+        }
         if (session)
             session.executor = undefined;
         // 停止请求抓包，采集调试期间的所有请求
@@ -763,19 +749,6 @@ export class DebugWebSocketServer {
         catch (captureErr) {
             logger.warn('[Debug] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
         }
-        // Teardown Whistle proxy rules if they were set
-        const currentSess = sessionManager.get(sessionId);
-        const whistleRuleName = currentSess ? currentSess.whistleRuleGroupName : undefined;
-        if (whistleRuleName) {
-            whistleManager.removeRuleGroup(whistleRuleName, whistleApiBase).catch((err) => {
-                logger.warn('[Debug] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
-            });
-            if (currentSess) {
-                currentSess.whistleRuleGroupName = undefined;
-                currentSess.whistleApiBase = undefined;
-            }
-            logger.info('[Debug] Whistle proxy teardown: ruleGroup=' + whistleRuleName);
-        }
         sessionManager.updateStatus(sessionId, result.success ? 'completed' : 'failed');
         // 调试：打印 result 内容
         logger.info(`[executeRunCodeInProcess] result: success=${result.success}, reportFile=${result.reportFile || ''}, errorMessage=${result.errorMessage}`);
@@ -801,7 +774,6 @@ export class DebugWebSocketServer {
             sessionId,
             success: result.success,
             reportUrl,
-            capturedRequests: capturedRequests.length > 0 ? this.simplifyCapturedRequests(capturedRequests) : undefined,
             captureDataUrl,
         }, request.deviceId);
     }
@@ -824,9 +796,7 @@ export class DebugWebSocketServer {
             nodeId: this.config.task.nodeId,
             modelConfig: fullModelConfig,
             // 环境代理配置
-            environmentId: request.environmentId,
-            proxyPort: request.proxyPort || (request.hostMappings && request.hostMappings.length > 0 ? 8899 : undefined),
-            hostMappings: request.hostMappings,
+            proxyPort: request.proxyPort || 8899,
             // 公司代理平台账号
             proxyAccount: request.proxyAccount,
             // 添加登录配置
@@ -841,38 +811,14 @@ export class DebugWebSocketServer {
                 agreementSelector: request.loginConfig.agreementSelector,
             }),
         };
-        // Setup proxy rules: 如果有 proxyAccount，使用公司代理平台；否则走本地 Whistle
-        const workerWhistleApiBase = execConfig.proxyAccount ? `http://proxy-pc.jd.com/account/${execConfig.proxyAccount}` : undefined;
-        if (execConfig.hostMappings && execConfig.hostMappings.length > 0) {
-            try {
-                const envId = execConfig.environmentId || sessionId;
-                const ruleGroupName = whistleManager.generateRuleGroupName(envId);
-                const success = await whistleManager.createRuleGroup(ruleGroupName, execConfig.hostMappings, workerWhistleApiBase);
-                if (success) {
-                    const sess = sessionManager.get(sessionId);
-                    if (sess) {
-                        sess.whistleRuleGroupName = ruleGroupName;
-                        sess.whistleApiBase = workerWhistleApiBase;
-                    }
-                    if (!execConfig.proxyAccount && !execConfig.proxyPort)
-                        execConfig.proxyPort = 8899;
-                    logger.info('[Debug-Worker] Whistle proxy setup: ruleGroup=' + ruleGroupName + ', proxyPort=' + execConfig.proxyPort + ', proxyAccount=' + (execConfig.proxyAccount || 'N/A'));
-                    // 开始请求抓包（传入 proxyAccount，自动选择正确的 Whistle 实例）
-                    try {
-                        await whistleManager.startCapture(sessionId, undefined, 3000, execConfig.proxyAccount);
-                        logger.info('[Debug-Worker] Whistle request capture started: sessionId=' + sessionId);
-                    }
-                    catch (captureErr) {
-                        logger.warn('[Debug-Worker] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
-                    }
-                }
-                else {
-                    logger.warn('[Debug-Worker] Whistle proxy setup failed, continuing without proxy');
-                }
-            }
-            catch (err) {
-                logger.warn('[Debug-Worker] Whistle proxy setup error: ' + (err instanceof Error ? err.message : String(err)));
-            }
+        // 注意：proxy-service.jd.com 的规则由前端（浏览器端）设置，后端只负责设备代理 + 抓包
+        // 始终启动请求抓包
+        try {
+            await whistleManager.startCapture(sessionId, undefined, 3000, execConfig.proxyAccount);
+            logger.info('[Debug-Worker] Whistle request capture started: sessionId=' + sessionId);
+        }
+        catch (captureErr) {
+            logger.warn('[Debug-Worker] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
         }
         // Fork worker process for long-running debug
         const workerPath = new URL('../executor/worker-entry.js', import.meta.url).pathname;
@@ -931,22 +877,6 @@ export class DebugWebSocketServer {
             catch (captureErr) {
                 logger.warn('[Debug-Worker] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
             }
-            // Teardown Whistle proxy rules if they were set
-            const curSess = sessionManager.get(sessionId);
-            const wRuleName = curSess ? curSess.whistleRuleGroupName : undefined;
-            if (wRuleName) {
-                try {
-                    await whistleManager.removeRuleGroup(wRuleName, workerWhistleApiBase);
-                    if (curSess) {
-                        curSess.whistleRuleGroupName = undefined;
-                        curSess.whistleApiBase = undefined;
-                    }
-                    logger.info('[Debug-Worker] Whistle proxy teardown: ruleGroup=' + wRuleName);
-                }
-                catch (err) {
-                    logger.warn('[Debug-Worker] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
-                }
-            }
             sessionManager.updateStatus(sessionId, success ? 'completed' : 'failed');
             const reportFile = workerResult.reportFile || '';
             const reportUrl = await this.safeUploadReport(reportFile, sessionId);
@@ -972,7 +902,6 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 error: workerResult.errorMessage,
-                capturedRequests: workerCapturedRequests.length > 0 ? this.simplifyCapturedRequests(workerCapturedRequests) : undefined,
                 captureDataUrl: workerCaptureDataUrl,
             }, request.deviceId);
         };
@@ -1058,12 +987,19 @@ export class DebugWebSocketServer {
                 executionId: sessionId,
                 skipAppRestart: request.skipAppRestart,
                 // 环境代理配置
-                environmentId: request.environmentId,
                 proxyPort: request.proxyPort,
-                hostMappings: request.hostMappings,
                 // 公司代理平台账号
                 proxyAccount: request.proxyAccount,
             };
+            // 注意：proxy-service.jd.com 的规则由前端（浏览器端）设置，后端只负责设备代理 + 抓包
+            // 始终启动请求抓包
+            try {
+                await whistleManager.startCapture(sessionId, undefined, 3000, config.proxyAccount);
+                logger.info('[Action] Whistle request capture started: sessionId=' + sessionId);
+            }
+            catch (captureErr) {
+                logger.warn('[Action] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             // 使用 AbortSignal 监听停止请求
             const executePromise = executor.execute(config);
             const abortPromise = new Promise((resolve) => {
@@ -1077,8 +1013,38 @@ export class DebugWebSocketServer {
                 logger.info(`[Action] Execution aborted by user, skipping result messages (handleStopDebug will send them)`);
                 return;
             }
-            // 清理 executor 引用
+            // 清理 executor（释放 device/agent 资源 + 清除设备代理）
+            if (executor && typeof executor.destroy === 'function') {
+                try {
+                    await executor.destroy();
+                }
+                catch (destroyErr) {
+                    logger.warn(`[Action] Executor destroy error: ${destroyErr.message}`);
+                }
+            }
             session.executor = undefined;
+            // 停止请求抓包，采集执行期间的所有请求
+            let capturedRequests = [];
+            let captureDataUrl;
+            try {
+                capturedRequests = await whistleManager.stopCapture(sessionId);
+                if (capturedRequests.length > 0) {
+                    logger.info('[Action] Captured ' + capturedRequests.length + ' requests during session');
+                    try {
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        if (uploadResult) {
+                            captureDataUrl = uploadResult;
+                            logger.info('[Action] Capture data uploaded: ' + captureDataUrl);
+                        }
+                    }
+                    catch (uploadErr) {
+                        logger.warn('[Action] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                    }
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[Action] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             const status = result.success ? 'completed' : 'failed';
             sessionManager.updateStatus(sessionId, status);
             logger.info(`[Action] Execution finished: sessionId=${sessionId}, status=${status}, ws.readyState=${ws.readyState}`);
@@ -1093,19 +1059,49 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 error: result.errorMessage,
+                captureDataUrl,
             }, request.deviceId);
             this.sendMessage(ws, {
                 type: 'debug_completed',
                 sessionId,
                 success: result.success,
                 reportUrl,
+                captureDataUrl,
             }, request.deviceId);
             logger.info(`[Action] Sent action_result + debug_completed for sessionId=${sessionId}`);
         }
         catch (error) {
+            // 清理 executor（释放 device/agent 资源 + 清除设备代理）
+            if (session.executor && typeof session.executor.destroy === 'function') {
+                try {
+                    await session.executor.destroy();
+                }
+                catch (destroyErr) {
+                    logger.warn(`[AiAct] Executor destroy error (catch): ${destroyErr.message}`);
+                }
+            }
             session.executor = undefined;
             sessionManager.updateStatus(sessionId, 'failed');
             logger.error(`[Action] Execution error: sessionId=${sessionId}, error=${error.message}, ws.readyState=${ws.readyState}`);
+            // 异常时也停止抓包并上传
+            let captureDataUrl;
+            try {
+                const capturedRequests = await whistleManager.stopCapture(sessionId);
+                if (capturedRequests.length > 0) {
+                    logger.info('[Action] Captured ' + capturedRequests.length + ' requests (error path)');
+                    try {
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        if (uploadResult)
+                            captureDataUrl = uploadResult;
+                    }
+                    catch (uploadErr) {
+                        logger.warn('[Action] Failed to upload capture data (error path): ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                    }
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[Action] Failed to stop capture (error path): ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             // 异常时也尝试提取 reportFile 并上传
             let reportFile = '';
             try {
@@ -1125,6 +1121,7 @@ export class DebugWebSocketServer {
                 error: error.message,
                 dump: '',
                 reportUrl,
+                captureDataUrl,
             }, request.deviceId);
             // 异常时也发送 debug_completed，确保前端能退出执行中状态
             this.sendMessage(ws, {
@@ -1132,6 +1129,7 @@ export class DebugWebSocketServer {
                 sessionId,
                 success: false,
                 reportUrl,
+                captureDataUrl,
             }, request.deviceId);
         }
     }
@@ -1143,6 +1141,14 @@ export class DebugWebSocketServer {
         session.abortController = abortController;
         // 将前端传来的 modelConfig 应用到环境变量，并获取补全后的 modelConfig（含 Planning/Insight）
         const fullModelConfig = this.applyModelConfig(request.modelConfig);
+        // 始终启动请求抓包
+        try {
+            await whistleManager.startCapture(sessionId);
+            logger.info('[AiAct] Whistle request capture started: sessionId=' + sessionId);
+        }
+        catch (captureErr) {
+            logger.warn('[AiAct] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+        }
         // 哨兵：保证 ai_act_result + debug_completed 一定且只发一次（即便发送时再次抛错）
         let finalSent = false;
         const sendFinal = (payload) => {
@@ -1150,6 +1156,7 @@ export class DebugWebSocketServer {
                 return;
             finalSent = true;
             const reportUrl = payload.reportUrl || null;
+            const captureDataUrl = payload.captureDataUrl;
             // 第一次尝试
             try {
                 this.sendMessage(ws, {
@@ -1162,6 +1169,7 @@ export class DebugWebSocketServer {
                     reportUrl,
                     error: payload.error,
                     platform: request.platform || 'android',
+                    captureDataUrl,
                 }, request.deviceId);
             }
             catch (e1) {
@@ -1177,6 +1185,7 @@ export class DebugWebSocketServer {
                         reportUrl,
                         error: (payload.error || '') + ' [send failed]',
                         platform: request.platform || 'android',
+                        captureDataUrl,
                     }, request.deviceId);
                 }
                 catch (e2) {
@@ -1190,6 +1199,7 @@ export class DebugWebSocketServer {
                     sessionId,
                     success: payload.success,
                     reportUrl,
+                    captureDataUrl,
                 }, request.deviceId);
                 logger.info(`[AiAct] Sent ai_act_result + debug_completed for sessionId=${sessionId}, success=${payload.success}, reportUrl=${reportUrl || 'null'}`);
             }
@@ -1239,6 +1249,15 @@ export class DebugWebSocketServer {
                     deepThink: request.deepThink,
                 },
             };
+            // 注意：proxy-service.jd.com 的规则由前端（浏览器端）设置，后端只负责设备代理 + 抓包
+            // 始终启动请求抓包
+            try {
+                await whistleManager.startCapture(sessionId, undefined, 3000, config.proxyAccount);
+                logger.info('[Action] Whistle request capture started: sessionId=' + sessionId);
+            }
+            catch (captureErr) {
+                logger.warn('[Action] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             // 使用 AbortSignal 监听停止请求
             const executePromise = executor.execute(config);
             const abortPromise = new Promise((resolve) => {
@@ -1253,7 +1272,37 @@ export class DebugWebSocketServer {
                 logger.info(`[AiAct] Execution aborted by user, skipping result messages (handleStopDebug will send them)`);
                 return;
             }
+            // 清理 executor（释放 device/agent 资源 + 清除设备代理）
+            if (executor && typeof executor.destroy === 'function') {
+                try {
+                    await executor.destroy();
+                }
+                catch (destroyErr) {
+                    logger.warn(`[AiAct] Executor destroy error: ${destroyErr.message}`);
+                }
+            }
             session.executor = undefined;
+            // 停止请求抓包，采集执行期间的所有请求
+            let captureDataUrl;
+            try {
+                const capturedRequests = await whistleManager.stopCapture(sessionId);
+                if (capturedRequests.length > 0) {
+                    logger.info('[AiAct] Captured ' + capturedRequests.length + ' requests during session');
+                    try {
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        if (uploadResult) {
+                            captureDataUrl = uploadResult;
+                            logger.info('[AiAct] Capture data uploaded: ' + captureDataUrl);
+                        }
+                    }
+                    catch (uploadErr) {
+                        logger.warn('[AiAct] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                    }
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[AiAct] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             const status = result.success ? 'completed' : 'failed';
             sessionManager.updateStatus(sessionId, status);
             logger.info(`[AiAct] Execution finished: sessionId=${sessionId}, status=${status}, ws.readyState=${ws.readyState}`);
@@ -1264,18 +1313,48 @@ export class DebugWebSocketServer {
                 result: result.result,
                 reportUrl,
                 error: result.errorMessage,
+                captureDataUrl,
             });
         }
         catch (error) {
+            // 清理 executor（释放 device/agent 资源 + 清除设备代理）
+            if (session.executor && typeof session.executor.destroy === 'function') {
+                try {
+                    await session.executor.destroy();
+                }
+                catch (destroyErr) {
+                    logger.warn(`[AiAct] Executor destroy error (catch): ${destroyErr.message}`);
+                }
+            }
             session.executor = undefined;
             sessionManager.updateStatus(sessionId, 'failed');
             logger.error(`[AiAct] Execution error: sessionId=${sessionId}, error=${error.message}, ws.readyState=${ws.readyState}`);
+            // 异常时也停止抓包并上传
+            let captureDataUrl;
+            try {
+                const capturedRequests = await whistleManager.stopCapture(sessionId);
+                if (capturedRequests.length > 0) {
+                    logger.info('[AiAct] Captured ' + capturedRequests.length + ' requests (error path)');
+                    try {
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        if (uploadResult)
+                            captureDataUrl = uploadResult;
+                    }
+                    catch (uploadErr) {
+                        logger.warn('[AiAct] Failed to upload capture data (error path): ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                    }
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[AiAct] Failed to stop capture (error path): ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             const reportFile = safeExtractReportFile();
             const reportUrl = await this.safeUploadReport(reportFile, sessionId);
             sendFinal({
                 success: false,
                 error: error.message,
                 reportUrl,
+                captureDataUrl,
             });
         }
         finally {
@@ -1363,6 +1442,14 @@ export class DebugWebSocketServer {
         }
         try {
             this.sendMessage(ws, { type: 'web_action_started', sessionId, actionType: request.actionType });
+            // 始终启动请求抓包
+            try {
+                await whistleManager.startCapture(sessionId);
+                logger.info('[WebAction] Whistle request capture started: sessionId=' + sessionId);
+            }
+            catch (captureErr) {
+                logger.warn('[WebAction] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             // 懒启动浏览器（每个 session 只启一次）
             if (!session.browser) {
                 // 并发上限保护：超过 webSessionMaxConcurrency 直接拒绝，防止 OOM / launch 失败
@@ -1458,6 +1545,7 @@ export class DebugWebSocketServer {
                 // 注意：worker 子进程路径（handleStartDebug 等）仍需经过 applyModelConfig 写 env，
                 // 因为 fork 子进程必须通过 env 透传配置，不影响这里。
                 session.webAgent = new midscene.PlaywrightAgent(page, {
+                    outputFormat: 'html-and-external-assets',
                     modelConfig: this.applyModelConfig(request.modelConfig),
                 });
                 // 注册到 web session 并发池，开始计入并发数 + TTL
@@ -1663,6 +1751,27 @@ export class DebugWebSocketServer {
             const actionSuccess = !runCodeError;
             sessionManager.updateStatus(sessionId, actionSuccess ? 'completed' : 'failed');
             stopWebDumpInterval();
+            // 停止请求抓包，采集执行期间的所有请求
+            let captureDataUrl;
+            try {
+                const capturedRequests = await whistleManager.stopCapture(sessionId);
+                if (capturedRequests.length > 0) {
+                    logger.info('[WebAction] Captured ' + capturedRequests.length + ' requests during session');
+                    try {
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        if (uploadResult) {
+                            captureDataUrl = uploadResult;
+                            logger.info('[WebAction] Capture data uploaded: ' + captureDataUrl);
+                        }
+                    }
+                    catch (uploadErr) {
+                        logger.warn('[WebAction] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                    }
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[WebAction] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             // 上传报告文件到服务端，拿到 reportUrl
             const reportUrl = await this.safeUploadReport(reportFile, sessionId);
             logger.info(`[WebAction] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
@@ -1676,6 +1785,7 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 error: runCodeError || undefined,
+                captureDataUrl,
             });
             // 与移动端对齐：同步发一份 action_result，供 debugLogManager 走报告链路
             this.sendMessage(ws, {
@@ -1688,6 +1798,7 @@ export class DebugWebSocketServer {
                 reportUrl,
                 error: runCodeError || undefined,
                 platform: 'web',
+                captureDataUrl,
             });
             // 必须发 debug_completed，前端依赖它退出执行中状态
             this.sendMessage(ws, {
@@ -1696,6 +1807,7 @@ export class DebugWebSocketServer {
                 success: actionSuccess,
                 reportUrl,
                 errorMessage: runCodeError || undefined,
+                captureDataUrl,
             });
         }
         catch (error) {
@@ -1706,6 +1818,25 @@ export class DebugWebSocketServer {
                 clearInterval(session.dumpIntervalId);
                 session.dumpIntervalId = undefined;
             }
+            // 异常时也停止抓包并上传
+            let captureDataUrl;
+            try {
+                const capturedRequests = await whistleManager.stopCapture(sessionId);
+                if (capturedRequests.length > 0) {
+                    logger.info('[WebAction] Captured ' + capturedRequests.length + ' requests (error path)');
+                    try {
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        if (uploadResult)
+                            captureDataUrl = uploadResult;
+                    }
+                    catch (uploadErr) {
+                        logger.warn('[WebAction] Failed to upload capture data (error path): ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                    }
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[WebAction] Failed to stop capture (error path): ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             // 失败时也尝试提取 reportFile 并上传
             let reportFile = '';
             const agentForReport = session?.webAgent;
@@ -1728,6 +1859,7 @@ export class DebugWebSocketServer {
                 error: error.message,
                 dump: '',
                 reportUrl,
+                captureDataUrl,
             });
             // 与移动端对齐：同步发一份 action_result
             this.sendMessage(ws, {
@@ -1739,6 +1871,7 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 platform: 'web',
+                captureDataUrl,
             });
             // 必须发 debug_completed，前端依赖它退出执行中状态
             this.sendMessage(ws, {
@@ -1746,6 +1879,7 @@ export class DebugWebSocketServer {
                 sessionId,
                 success: false,
                 reportUrl,
+                captureDataUrl,
                 errorMessage: error.message,
             });
         }
@@ -1862,23 +1996,6 @@ export class DebugWebSocketServer {
         catch (captureErr) {
             logger.warn('[CloseWebSession] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
         }
-        // Teardown Whistle proxy rules if they were set
-        const closeSess = sessionManager.get(request.sessionId);
-        const closeWhistleRule = closeSess ? closeSess.whistleRuleGroupName : undefined;
-        if (closeWhistleRule) {
-            try {
-                const closeWhistleApiBase = closeSess ? closeSess.whistleApiBase : undefined;
-                await whistleManager.removeRuleGroup(closeWhistleRule, closeWhistleApiBase);
-                if (closeSess) {
-                    closeSess.whistleRuleGroupName = undefined;
-                    closeSess.whistleApiBase = undefined;
-                }
-                logger.info('[CloseWebSession] Whistle proxy teardown: ruleGroup=' + closeWhistleRule);
-            }
-            catch (err) {
-                logger.warn('[CloseWebSession] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
-            }
-        }
         sessionManager.updateStatus(request.sessionId, 'stopped');
         this.sendMessage(ws, { type: 'web_session_closed', sessionId: request.sessionId });
     }
@@ -1954,23 +2071,6 @@ export class DebugWebSocketServer {
         catch (captureErr) {
             logger.warn('[StopDebug] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
         }
-        // Teardown Whistle proxy rules if they were set
-        const stopSess = sessionManager.get(request.sessionId);
-        const stopWhistleRule = stopSess ? stopSess.whistleRuleGroupName : undefined;
-        if (stopWhistleRule) {
-            try {
-                const stopWhistleApiBase = stopSess ? stopSess.whistleApiBase : undefined;
-                await whistleManager.removeRuleGroup(stopWhistleRule, stopWhistleApiBase);
-                if (stopSess) {
-                    stopSess.whistleRuleGroupName = undefined;
-                    stopSess.whistleApiBase = undefined;
-                }
-                logger.info('[StopDebug] Whistle proxy teardown: ruleGroup=' + stopWhistleRule);
-            }
-            catch (err) {
-                logger.warn('[StopDebug] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
-            }
-        }
         sessionManager.updateStatus(request.sessionId, 'stopped');
         // 上传报告文件到服务端，拿到 reportUrl
         const reportUrl = await this.safeUploadReport(reportFile, request.sessionId);
@@ -1994,7 +2094,6 @@ export class DebugWebSocketServer {
             type: 'debug_stopped',
             sessionId: request.sessionId,
             reportUrl,
-            capturedRequests: stopCapturedRequests.length > 0 ? this.simplifyCapturedRequests(stopCapturedRequests) : undefined,
             captureDataUrl: stopCaptureDataUrl,
         });
         // 同时发送 action_result，让前端能获取到停止时的执行数据
@@ -2005,6 +2104,7 @@ export class DebugWebSocketServer {
             error: 'Action stopped by user',
             dump: '',
             reportUrl,
+            captureDataUrl: stopCaptureDataUrl,
         });
         // 发送 debug_completed
         this.sendMessage(ws, {
@@ -2012,7 +2112,6 @@ export class DebugWebSocketServer {
             sessionId: request.sessionId,
             success: false,
             reportUrl,
-            capturedRequests: stopCapturedRequests.length > 0 ? this.simplifyCapturedRequests(stopCapturedRequests) : undefined,
             captureDataUrl: stopCaptureDataUrl,
         });
     }
@@ -2135,6 +2234,14 @@ export class DebugWebSocketServer {
                 timestamp: new Date().toISOString(),
             };
             if (ws.readyState === ws.OPEN) {
+                const messageType = String(message.type || '');
+                const canDropUnderBackpressure = messageType === 'action_dump' ||
+                    messageType === 'execution_line' ||
+                    messageType === 'task_log';
+                if (canDropUnderBackpressure && ws.bufferedAmount > 2 * 1024 * 1024) {
+                    logger.warn(`[WS] Dropping ${messageType} due to backpressure: buffered=${ws.bufferedAmount}, sessionId=${message.sessionId || ''}`);
+                    return;
+                }
                 let payload = JSON.stringify(msg);
                 // WSS 自身 maxPayload=10MB（接收端），发送端我们保留 2MB 余量以兼容反代/网关
                 const MAX_PAYLOAD_SIZE = 2 * 1024 * 1024; // 2MB
@@ -2219,56 +2326,29 @@ export class DebugWebSocketServer {
             return undefined;
         }
     }
-    simplifyCapturedRequests(requests) {
-        const MAX_BODY_LENGTH = 4096;
-        return requests.map(req => {
-            const simplified = {
-                id: req.id,
-                url: req.url,
-                method: req.method,
-                statusCode: req.statusCode,
-                clientIp: req.clientIp,
-                startTime: req.startTime,
-                endTime: req.endTime,
-                duration: req.duration,
-                dnsTime: req.dnsTime,
-                requestTime: req.requestTime,
-                responseTime: req.responseTime,
-            };
-            // 请求头只保留 content-type 和 content-length
-            if (req.reqHeaders) {
-                const filteredReqHeaders = {};
-                for (const [k, v] of Object.entries(req.reqHeaders)) {
-                    if (k.toLowerCase() === 'content-type' || k.toLowerCase() === 'content-length') {
-                        filteredReqHeaders[k] = v;
-                    }
-                }
-                simplified.reqHeaders = filteredReqHeaders;
-            }
-            if (req.resHeaders) {
-                const filteredResHeaders = {};
-                for (const [k, v] of Object.entries(req.resHeaders)) {
-                    if (k.toLowerCase() === 'content-type' || k.toLowerCase() === 'content-length') {
-                        filteredResHeaders[k] = v;
-                    }
-                }
-                simplified.resHeaders = filteredResHeaders;
-            }
-            // body 截断
-            if (req.reqBody) {
-                simplified.reqBody = req.reqBody.length > MAX_BODY_LENGTH
-                    ? req.reqBody.substring(0, MAX_BODY_LENGTH) + '...[truncated]'
-                    : req.reqBody;
+    async cleanupSession(sessionId) {
+        const session = sessionManager.get(sessionId);
+        if (session?.abortController && !session.abortController.signal.aborted) {
+            session.abortController.abort();
+        }
+        if (session?.executor && typeof session.executor.destroy === 'function') {
+            try {
+                await session.executor.destroy();
             }
-            if (req.resBody) {
-                simplified.resBody = req.resBody.length > MAX_BODY_LENGTH
-                    ? req.resBody.substring(0, MAX_BODY_LENGTH) + '...[truncated]'
-                    : req.resBody;
+            catch (error) {
+                logger.warn(`[Cleanup] Executor destroy failed: sessionId=${sessionId}, error=${error.message}`);
             }
-            return simplified;
-        });
-    }
-    async cleanupSession(sessionId) {
+            session.executor = undefined;
+        }
+        if (session?.process && !session.process.killed) {
+            session.process.kill('SIGTERM');
+        }
+        try {
+            await whistleManager.stopCapture(sessionId);
+        }
+        catch (error) {
+            logger.warn(`[Cleanup] Capture stop failed: sessionId=${sessionId}, error=${error.message}`);
+        }
         // 关闭 web 浏览器（如果存在）
         await this.closeWebSession(sessionId);
         dumpManager.stopPeriodicDump(sessionId);
@@ -2279,6 +2359,7 @@ export class DebugWebSocketServer {
         return sessionManager.getAll();
     }
     async close() {
+        await Promise.all(sessionManager.getAll().map((session) => this.cleanupSession(session.sessionId)));
         await screencastManager.closeAll();
         await webScreencastManager.closeAll();
         await webBrowserPool.closeAll();