@aiscene/aiserver 1.6.5 → 1.6.7

package/dist/debug/websocket-server.js

@@ -2,7 +2,9 @@ import { WebSocketServer } from 'ws';
 import { fork } from 'child_process';
 import { URL } from 'url';
 import os from 'os';
-import { uploadReportToServer } from '../api/callback.js';
+import { uploadReportToServer, uploadCapturePackageFile } from '../api/callback.js';
+import fs from 'fs';
+import path from 'path';
 import { createLogger } from '../core/logger.js';
 import { eventBus } from '../core/event-bus.js';
 import { sessionManager } from './session-manager.js';
@@ -13,6 +15,7 @@ import { webBrowserPool } from './web-browser-pool.js';
 import { ExecutorFactory } from '../executor/executor-factory.js';
 import { instrumentCode } from '../executor/code-instrument.js';
 import { playwrightSwipe } from '../core/native-swipe.js';
+import { whistleManager } from '../proxy/whistle-manager.js';
 const logger = createLogger('DebugWebSocket');
 /** 获取本机可用的非内部 IPv4 地址，供客户端连接投屏 WebSocket */
 function getLocalIP() {
@@ -226,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', () => {
@@ -661,6 +666,10 @@ export class DebugWebSocketServer {
             executionId: sessionId,
             mobileMode: request.mobileMode,
             deviceName: request.deviceName,
+            // 环境代理配置
+            proxyPort: request.proxyPort || 8899,
+            // 公司代理平台账号
+            proxyAccount: request.proxyAccount,
             // 添加登录配置
             ...(request.loginConfig && {
                 loginUrl: request.loginConfig.loginUrl,
@@ -673,6 +682,14 @@ export class DebugWebSocketServer {
                 agreementSelector: request.loginConfig.agreementSelector,
             }),
         };
+        // 注意：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);
         const abortPromise = new Promise((resolve) => {
@@ -695,9 +712,40 @@ 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;
+        // 停止请求抓包，采集调试期间的所有请求
+        let capturedRequests = [];
+        let captureDataUrl;
+        try {
+            capturedRequests = await whistleManager.stopCapture(sessionId);
+            if (capturedRequests.length > 0) {
+                logger.info('[Debug] Captured ' + capturedRequests.length + ' requests during debug session');
+                // 将抓包数据保存到文件并上传到 OSS
+                try {
+                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                    if (uploadResult) {
+                        captureDataUrl = uploadResult;
+                        logger.info('[Debug] Capture data uploaded: ' + captureDataUrl);
+                    }
+                }
+                catch (uploadErr) {
+                    logger.warn('[Debug] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                }
+            }
+        }
+        catch (captureErr) {
+            logger.warn('[Debug] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+        }
         sessionManager.updateStatus(sessionId, result.success ? 'completed' : 'failed');
         // 调试：打印 result 内容
         logger.info(`[executeRunCodeInProcess] result: success=${result.success}, reportFile=${result.reportFile || ''}, errorMessage=${result.errorMessage}`);
@@ -714,13 +762,16 @@ export class DebugWebSocketServer {
             reportUrl,
             error: result.errorMessage,
             platform: request.platform || 'android',
+            captureDataUrl,
         }, request.deviceId);
         // 同时发一份 debug_completed，让前端调试面板能正确更新状态
+        // capturedRequests 只发摘要给前端展示，完整数据通过 captureDataUrl (OSS URL) 获取
         this.sendMessage(ws, {
             type: 'debug_completed',
             sessionId,
             success: result.success,
             reportUrl,
+            captureDataUrl,
         }, request.deviceId);
     }
     /** 自然语言模式：Fork worker 进程执行 aiAction */
@@ -741,6 +792,10 @@ export class DebugWebSocketServer {
             taskId: sessionId,
             nodeId: this.config.task.nodeId,
             modelConfig: fullModelConfig,
+            // 环境代理配置
+            proxyPort: request.proxyPort || 8899,
+            // 公司代理平台账号
+            proxyAccount: request.proxyAccount,
             // 添加登录配置
             ...(request.loginConfig && {
                 loginUrl: request.loginConfig.loginUrl,
@@ -753,6 +808,15 @@ export class DebugWebSocketServer {
                 agreementSelector: request.loginConfig.agreementSelector,
             }),
         };
+        // 注意：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;
         // 优先使用 process.env 中已被 applyModelConfig() 设置的值（前端传入的模型配置），
@@ -799,10 +863,35 @@ export class DebugWebSocketServer {
                 return;
             resultHandled = true;
             const success = workerResult.success !== false;
+            // 停止请求抓包，采集调试期间的所有请求
+            let workerCapturedRequests = [];
+            try {
+                workerCapturedRequests = await whistleManager.stopCapture(sessionId);
+                if (workerCapturedRequests.length > 0) {
+                    logger.info('[Debug-Worker] Captured ' + workerCapturedRequests.length + ' requests during debug session');
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[Debug-Worker] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
             sessionManager.updateStatus(sessionId, success ? 'completed' : 'failed');
             const reportFile = workerResult.reportFile || '';
             const reportUrl = await this.safeUploadReport(reportFile, sessionId);
             logger.info(`[Debug] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
+            // 将 worker 抓包数据保存到文件并上传到 OSS
+            let workerCaptureDataUrl;
+            if (workerCapturedRequests.length > 0) {
+                try {
+                    const uploadResult = await this.saveAndUploadCaptureData(workerCapturedRequests, sessionId);
+                    if (uploadResult) {
+                        workerCaptureDataUrl = uploadResult;
+                        logger.info('[Debug-Worker] Capture data uploaded: ' + workerCaptureDataUrl);
+                    }
+                }
+                catch (uploadErr) {
+                    logger.warn('[Debug-Worker] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                }
+            }
             this.sendMessage(ws, {
                 type: 'debug_completed',
                 sessionId,
@@ -810,6 +899,7 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 error: workerResult.errorMessage,
+                captureDataUrl: workerCaptureDataUrl,
             }, request.deviceId);
         };
         childProcess.on('message', (message) => {
@@ -893,7 +983,20 @@ export class DebugWebSocketServer {
                 modelConfig: fullModelConfig,
                 executionId: sessionId,
                 skipAppRestart: request.skipAppRestart,
+                // 环境代理配置
+                proxyPort: request.proxyPort,
+                // 公司代理平台账号
+                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) => {
@@ -907,8 +1010,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}`);
@@ -923,19 +1056,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 {
@@ -955,6 +1118,7 @@ export class DebugWebSocketServer {
                 error: error.message,
                 dump: '',
                 reportUrl,
+                captureDataUrl,
             }, request.deviceId);
             // 异常时也发送 debug_completed，确保前端能退出执行中状态
             this.sendMessage(ws, {
@@ -962,6 +1126,7 @@ export class DebugWebSocketServer {
                 sessionId,
                 success: false,
                 reportUrl,
+                captureDataUrl,
             }, request.deviceId);
         }
     }
@@ -973,6 +1138,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) => {
@@ -980,6 +1153,7 @@ export class DebugWebSocketServer {
                 return;
             finalSent = true;
             const reportUrl = payload.reportUrl || null;
+            const captureDataUrl = payload.captureDataUrl;
             // 第一次尝试
             try {
                 this.sendMessage(ws, {
@@ -992,6 +1166,7 @@ export class DebugWebSocketServer {
                     reportUrl,
                     error: payload.error,
                     platform: request.platform || 'android',
+                    captureDataUrl,
                 }, request.deviceId);
             }
             catch (e1) {
@@ -1007,6 +1182,7 @@ export class DebugWebSocketServer {
                         reportUrl,
                         error: (payload.error || '') + ' [send failed]',
                         platform: request.platform || 'android',
+                        captureDataUrl,
                     }, request.deviceId);
                 }
                 catch (e2) {
@@ -1020,6 +1196,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'}`);
             }
@@ -1069,6 +1246,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) => {
@@ -1083,7 +1269,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}`);
@@ -1094,18 +1310,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 {
@@ -1193,6 +1439,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 失败
@@ -1493,6 +1747,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}`);
@@ -1506,6 +1781,7 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 error: runCodeError || undefined,
+                captureDataUrl,
             });
             // 与移动端对齐：同步发一份 action_result，供 debugLogManager 走报告链路
             this.sendMessage(ws, {
@@ -1518,6 +1794,7 @@ export class DebugWebSocketServer {
                 reportUrl,
                 error: runCodeError || undefined,
                 platform: 'web',
+                captureDataUrl,
             });
             // 必须发 debug_completed，前端依赖它退出执行中状态
             this.sendMessage(ws, {
@@ -1526,6 +1803,7 @@ export class DebugWebSocketServer {
                 success: actionSuccess,
                 reportUrl,
                 errorMessage: runCodeError || undefined,
+                captureDataUrl,
             });
         }
         catch (error) {
@@ -1536,6 +1814,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;
@@ -1558,6 +1855,7 @@ export class DebugWebSocketServer {
                 error: error.message,
                 dump: '',
                 reportUrl,
+                captureDataUrl,
             });
             // 与移动端对齐：同步发一份 action_result
             this.sendMessage(ws, {
@@ -1569,6 +1867,7 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 platform: 'web',
+                captureDataUrl,
             });
             // 必须发 debug_completed，前端依赖它退出执行中状态
             this.sendMessage(ws, {
@@ -1576,6 +1875,7 @@ export class DebugWebSocketServer {
                 sessionId,
                 success: false,
                 reportUrl,
+                captureDataUrl,
                 errorMessage: error.message,
             });
         }
@@ -1685,6 +1985,13 @@ export class DebugWebSocketServer {
             return;
         }
         await this.closeWebSession(request.sessionId);
+        // 停止请求抓包
+        try {
+            await whistleManager.stopCapture(request.sessionId);
+        }
+        catch (captureErr) {
+            logger.warn('[CloseWebSession] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+        }
         sessionManager.updateStatus(request.sessionId, 'stopped');
         this.sendMessage(ws, { type: 'web_session_closed', sessionId: request.sessionId });
     }
@@ -1749,15 +2056,41 @@ export class DebugWebSocketServer {
         }
         // 关闭 web 浏览器（如果存在）
         await this.closeWebSession(request.sessionId);
+        // 停止请求抓包，采集调试期间的所有请求
+        let stopCapturedRequests = [];
+        try {
+            stopCapturedRequests = await whistleManager.stopCapture(request.sessionId);
+            if (stopCapturedRequests.length > 0) {
+                logger.info('[StopDebug] Captured ' + stopCapturedRequests.length + ' requests during debug session');
+            }
+        }
+        catch (captureErr) {
+            logger.warn('[StopDebug] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+        }
         sessionManager.updateStatus(request.sessionId, 'stopped');
         // 上传报告文件到服务端，拿到 reportUrl
         const reportUrl = await this.safeUploadReport(reportFile, request.sessionId);
         logger.info(`[StopDebug] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
+        // 将停止时的抓包数据保存到文件并上传到 OSS
+        let stopCaptureDataUrl;
+        if (stopCapturedRequests.length > 0) {
+            try {
+                const uploadResult = await this.saveAndUploadCaptureData(stopCapturedRequests, request.sessionId);
+                if (uploadResult) {
+                    stopCaptureDataUrl = uploadResult;
+                    logger.info('[StopDebug] Capture data uploaded: ' + stopCaptureDataUrl);
+                }
+            }
+            catch (uploadErr) {
+                logger.warn('[StopDebug] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+            }
+        }
         // 发送带执行数据的停止消息
         this.sendMessage(ws, {
             type: 'debug_stopped',
             sessionId: request.sessionId,
             reportUrl,
+            captureDataUrl: stopCaptureDataUrl,
         });
         // 同时发送 action_result，让前端能获取到停止时的执行数据
         this.sendMessage(ws, {
@@ -1767,6 +2100,7 @@ export class DebugWebSocketServer {
             error: 'Action stopped by user',
             dump: '',
             reportUrl,
+            captureDataUrl: stopCaptureDataUrl,
         });
         // 发送 debug_completed
         this.sendMessage(ws, {
@@ -1774,6 +2108,7 @@ export class DebugWebSocketServer {
             sessionId: request.sessionId,
             success: false,
             reportUrl,
+            captureDataUrl: stopCaptureDataUrl,
         });
     }
     // ==================== Get Logs ====================
@@ -1937,6 +2272,48 @@ export class DebugWebSocketServer {
     sendError(ws, error) {
         this.sendMessage(ws, { type: 'error', error });
     }
+    /**
+     * 精简 CapturedRequest 列表，去除大 body 只保留摘要信息，
+     * 避免 WebSocket 消息过大（单条 body 上限 4KB，超出截断）
+     */
+    /**
+     * 将抓包数据保存到本地文件并上传到 OSS
+     * 返回 OSS URL，失败则返回 undefined
+     */
+    async saveAndUploadCaptureData(capturedRequests, sessionId) {
+        if (!capturedRequests || capturedRequests.length === 0)
+            return undefined;
+        try {
+            // 保存到本地临时文件
+            const tmpDir = path.join(process.cwd(), 'tmp', 'captures');
+            if (!fs.existsSync(tmpDir)) {
+                fs.mkdirSync(tmpDir, { recursive: true });
+            }
+            const captureFile = path.join(tmpDir, `capture_${sessionId}_${Date.now()}.json`);
+            fs.writeFileSync(captureFile, JSON.stringify(capturedRequests, null, 2));
+            logger.info(`[CaptureUpload] Saved capture data to: ${captureFile} (${capturedRequests.length} requests)`);
+            // 上传到 OSS
+            const uploadUrl = this.config?.callback?.packageFileUploadUrl;
+            if (!uploadUrl) {
+                logger.warn('[CaptureUpload] packageFileUploadUrl not configured, skip upload');
+                return undefined;
+            }
+            const captureDataUrl = await uploadCapturePackageFile(captureFile, sessionId, uploadUrl);
+            if (captureDataUrl) {
+                // 上传成功后删除本地临时文件
+                try {
+                    fs.unlinkSync(captureFile);
+                }
+                catch { }
+                return captureDataUrl;
+            }
+            return undefined;
+        }
+        catch (err) {
+            logger.error('[CaptureUpload] Failed to save/upload capture data: ' + (err instanceof Error ? err.message : String(err)));
+            return undefined;
+        }
+    }
     async cleanupSession(sessionId) {
         // 关闭 web 浏览器（如果存在）
         await this.closeWebSession(sessionId);