@aiscene/aiserver 1.4.2 → 1.4.4

package/dist/debug/websocket-server.js

@@ -30,41 +30,71 @@ function getLocalIP() {
     }
     return '127.0.0.1';
 }
-/** 上传报告 HTML 到服务器 */
-async function uploadReportToServer(reportHTML, sessionId, uploadUrl) {
-    if (!reportHTML) {
-        logger.debug('[UploadReport] No report HTML to upload');
+/** 上传报告文件到服务器（流式上传，不将整个文件读入内存） */
+async function uploadReportToServer(reportFilePath, sessionId, uploadUrl) {
+    if (!reportFilePath) {
+        logger.info('[UploadReport] No report file path provided, skip upload');
         return null;
     }
+    logger.info(`[UploadReport] === Start upload === sessionId=${sessionId}, filePath=${reportFilePath}`);
     try {
-        const buffer = Buffer.from(reportHTML, 'utf-8');
+        if (!fs.existsSync(reportFilePath)) {
+            logger.warn(`[UploadReport] Report file not found: ${reportFilePath}, skip upload`);
+            return null;
+        }
+        const stat = fs.statSync(reportFilePath);
+        const fileSizeMB = (stat.size / 1024 / 1024).toFixed(2);
+        logger.info(`[UploadReport] File exists: ${reportFilePath}, size=${stat.size} bytes (${fileSizeMB}MB)`);
+        logger.info(`[UploadReport] Uploading to: POST ${uploadUrl}, sessionId=${sessionId}`);
+        const uploadStart = Date.now();
+        // 读取文件内容（与 callback.ts uploadReportFile 保持一致的写法，确保后端能正确解析 multipart）
+        let fileBuffer;
+        if (stat.size > 50 * 1024 * 1024) {
+            fileBuffer = await new Promise((resolve, reject) => {
+                const chunks = [];
+                const readStream = fs.createReadStream(reportFilePath);
+                readStream.on('data', (chunk) => chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)));
+                readStream.on('end', () => resolve(Buffer.concat(chunks)));
+                readStream.on('error', reject);
+            });
+        }
+        else {
+            fileBuffer = fs.readFileSync(reportFilePath);
+        }
+        const fileName = `report_${sessionId}.html`;
         const formData = new FormData();
-        formData.append('file', buffer, {
-            filename: `report_${sessionId}.html`,
-            contentType: 'text/html',
-        });
+        formData.append('file', fileBuffer, fileName);
         formData.append('sessionId', sessionId);
-        logger.info(`[UploadReport] Request: POST ${uploadUrl}`);
-        logger.info(`[UploadReport] Request body: sessionId=${sessionId}, fileSize=${buffer.length} bytes`);
         const response = await axios.post(uploadUrl, formData, {
             headers: {
                 'User-Agent': 'aiserver/1.0',
-                'Accept': 'application/json',
+                'Accept': '*/*',
+                'Connection': 'close',
+                'Expect': '',
+                // form-data 库会自动设置 Content-Type（含 boundary），必须带上
+                ...formData.getHeaders(),
             },
-            timeout: 60000, // 60s 超时
+            timeout: 120000,
+            maxRedirects: 0,
         });
-        logger.info(`[UploadReport] Response status: ${response.status}`);
+        const uploadCost = Date.now() - uploadStart;
+        logger.info(`[UploadReport] Response: status=${response.status}, cost=${uploadCost}ms`);
         logger.info(`[UploadReport] Response data: ${JSON.stringify(response.data)}`);
-        if (response.data && response.data.reportUrl) {
-            logger.info(`[UploadReport] Upload successful, reportUrl: ${response.data.reportUrl}`);
-            return response.data.reportUrl;
+        // 后端返回 { code: 200, data: { sessionId, reportUrl } } 或 { success: true, data: { reportUrl } }
+        const reportUrl = response.data?.data?.reportUrl || response.data?.reportUrl;
+        if (reportUrl) {
+            logger.info(`[UploadReport] === Upload successful === reportUrl=${reportUrl}, cost=${uploadCost}ms, size=${fileSizeMB}MB`);
+            return reportUrl;
         }
-        logger.warn(`[UploadReport] Upload response missing reportUrl`);
+        logger.warn(`[UploadReport] Upload response missing reportUrl, response=${JSON.stringify(response.data)}`);
         return null;
     }
     catch (error) {
         const err = error;
-        logger.error(`[UploadReport] Upload failed: ${err.message}`);
+        logger.error(`[UploadReport] === Upload failed === error=${err.message}`);
+        if (err.code) {
+            logger.error(`[UploadReport] Error code: ${err.code}`);
+        }
         if (err.response) {
             logger.error(`[UploadReport] Response status: ${err.response.status}`);
             logger.error(`[UploadReport] Response data: ${JSON.stringify(err.response.data)}`);
@@ -467,20 +497,18 @@ export class DebugWebSocketServer {
             session.executor = undefined;
         sessionManager.updateStatus(sessionId, result.success ? 'completed' : 'failed');
         // 调试：打印 result 内容
-        logger.info(`[executeRunCodeInProcess] result: success=${result.success}, reportHTML length=${(result.reportHTML || '').length}, errorMessage=${result.errorMessage}`);
-        // 调试场景不再上传报告到服务端：reportHTML 直接通过长链接回前端，避免上传卡住
-        const reportHTML = result.reportHTML || '';
-        const reportUrl = null;
-        logger.info(`[executeRunCodeInProcess] Skip server upload (debug mode), reportHTML size=${reportHTML.length}`);
+        logger.info(`[executeRunCodeInProcess] result: success=${result.success}, reportFile=${result.reportFile || ''}, errorMessage=${result.errorMessage}`);
+        const reportFile = result.reportFile || '';
+        const reportUrl = await this.safeUploadReport(reportFile, sessionId);
+        logger.info(`[executeRunCodeInProcess] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
         this.sendMessage(ws, {
             type: 'action_result',
             sessionId,
             actionType: 'runCode',
             success: result.success,
             result: result.result,
-            dump: result.executionDump || result.dump || '',
-            reportHTML: reportHTML,
-            reportUrl: reportUrl, // 上传后的报告 URL
+            dump: '',
+            reportUrl,
             error: result.errorMessage,
             platform: request.platform || 'android',
         }, request.deviceId);
@@ -489,7 +517,7 @@ export class DebugWebSocketServer {
             type: 'debug_completed',
             sessionId,
             success: result.success,
-            reportUrl: reportUrl,
+            reportUrl,
         }, request.deviceId);
     }
     /** 自然语言模式：Fork worker 进程执行 aiAction */
@@ -560,37 +588,16 @@ export class DebugWebSocketServer {
             resultHandled = true;
             const success = workerResult.success !== false;
             sessionManager.updateStatus(sessionId, success ? 'completed' : 'failed');
-            // 尝试读取 reportFile 内容并上传到服务器
-            let reportHTML = '';
-            let reportUrl = null;
-            const reportFile = workerResult.reportFile;
-            if (reportFile) {
-                try {
-                    if (fs.existsSync(reportFile)) {
-                        reportHTML = fs.readFileSync(reportFile, 'utf-8');
-                        logger.info(`[Debug] Read reportFile: ${reportFile}, size=${reportHTML.length}`);
-                    }
-                    else {
-                        logger.warn(`[Debug] reportFile does not exist: ${reportFile}`);
-                    }
-                }
-                catch (e) {
-                    logger.warn(`[Debug] Read reportFile failed: ${e.message}`);
-                }
-            }
-            if (reportHTML && reportHTML.length > 0) {
-                // 调试场景不再上传报告到服务端：reportHTML 直接通过长链接回前端
-                logger.info(`[Debug] Skip server upload (debug mode), reportHTML size=${reportHTML.length}`);
-            }
+            const reportFile = workerResult.reportFile || '';
+            const reportUrl = await this.safeUploadReport(reportFile, sessionId);
+            logger.info(`[Debug] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
             this.sendMessage(ws, {
                 type: 'debug_completed',
                 sessionId,
                 success,
-                dump: workerResult.dump || '',
-                reportFile,
-                reportHTML,
+                dump: '',
                 reportUrl,
-                errorMessage: workerResult.errorMessage,
+                error: workerResult.errorMessage,
             }, request.deviceId);
         };
         childProcess.on('message', (message) => {
@@ -692,25 +699,23 @@ export class DebugWebSocketServer {
             const status = result.success ? 'completed' : 'failed';
             sessionManager.updateStatus(sessionId, status);
             logger.info(`[Action] Execution finished: sessionId=${sessionId}, status=${status}, ws.readyState=${ws.readyState}`);
-            // 调试场景不再上传报告到服务端：reportHTML 直接通过长链接回前端渲染即可，
-            // 避免上传卡住导致 action_result 永远发不出来的问题。
-            const reportHTML = result.reportHTML || '';
-            logger.info(`[Action] Skip server upload (debug mode), reportHTML size=${reportHTML.length}`);
+            const reportFile = result.reportFile || '';
+            const reportUrl = await this.safeUploadReport(reportFile, sessionId);
+            logger.info(`[Action] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
             this.sendMessage(ws, {
                 type: 'action_result',
                 sessionId,
                 success: result.success,
                 result: result.result,
-                dump: result.executionDump || result.dump || '',
-                reportHTML,
-                reportUrl: null,
+                dump: '',
+                reportUrl,
                 error: result.errorMessage,
             }, request.deviceId);
             this.sendMessage(ws, {
                 type: 'debug_completed',
                 sessionId,
                 success: result.success,
-                reportUrl: null,
+                reportUrl,
             }, request.deviceId);
             logger.info(`[Action] Sent action_result + debug_completed for sessionId=${sessionId}`);
         }
@@ -718,30 +723,32 @@ export class DebugWebSocketServer {
             session.executor = undefined;
             sessionManager.updateStatus(sessionId, 'failed');
             logger.error(`[Action] Execution error: sessionId=${sessionId}, error=${error.message}, ws.readyState=${ws.readyState}`);
-            // 异常时也尝试提取 reportHTML
-            let reportHTML = '';
+            // 异常时也尝试提取 reportFile 并上传
+            let reportFile = '';
             try {
                 const agent = session.executor?.getAgent?.() || session.agent;
-                if (agent && typeof agent.reportHTMLString === 'function') {
-                    reportHTML = agent.reportHTMLString({ inlineScreenshots: true }) || '';
+                if (agent && typeof agent.reportFile === 'string') {
+                    reportFile = agent.reportFile || '';
                 }
             }
             catch (e) {
-                logger.warn(`[Action] Failed to extract reportHTML on error: ${e.message}`);
+                logger.warn(`[Action] Failed to extract reportFile on error: ${e.message}`);
             }
+            const reportUrl = await this.safeUploadReport(reportFile, sessionId);
             this.sendMessage(ws, {
                 type: 'action_result',
                 sessionId,
                 success: false,
                 error: error.message,
-                reportHTML,
                 dump: '',
+                reportUrl,
             }, request.deviceId);
             // 异常时也发送 debug_completed，确保前端能退出执行中状态
             this.sendMessage(ws, {
                 type: 'debug_completed',
                 sessionId,
                 success: false,
+                reportUrl,
             }, request.deviceId);
         }
     }
@@ -753,6 +760,73 @@ export class DebugWebSocketServer {
         session.abortController = abortController;
         // 将前端传来的 modelConfig 应用到环境变量
         this.applyModelConfig(request.modelConfig);
+        // 哨兵：保证 ai_act_result + debug_completed 一定且只发一次（即便发送时再次抛错）
+        let finalSent = false;
+        const sendFinal = (payload) => {
+            if (finalSent)
+                return;
+            finalSent = true;
+            const reportUrl = payload.reportUrl || null;
+            // 第一次尝试
+            try {
+                this.sendMessage(ws, {
+                    type: 'ai_act_result',
+                    sessionId,
+                    actionType: 'aiAct',
+                    success: payload.success,
+                    result: payload.result,
+                    dump: '',
+                    reportUrl,
+                    error: payload.error,
+                    platform: request.platform || 'android',
+                }, request.deviceId);
+            }
+            catch (e1) {
+                logger.error(`[AiAct] sendFinal ai_act_result failed: ${e1.message}, retry`);
+                try {
+                    this.sendMessage(ws, {
+                        type: 'ai_act_result',
+                        sessionId,
+                        actionType: 'aiAct',
+                        success: payload.success,
+                        result: payload.result,
+                        dump: '',
+                        reportUrl,
+                        error: (payload.error || '') + ' [send failed]',
+                        platform: request.platform || 'android',
+                    }, request.deviceId);
+                }
+                catch (e2) {
+                    logger.error(`[AiAct] sendFinal retry also failed: ${e2.message}`);
+                }
+            }
+            // 不论上面成败，debug_completed 必须发
+            try {
+                this.sendMessage(ws, {
+                    type: 'debug_completed',
+                    sessionId,
+                    success: payload.success,
+                    reportUrl,
+                }, request.deviceId);
+                logger.info(`[AiAct] Sent ai_act_result + debug_completed for sessionId=${sessionId}, success=${payload.success}, reportUrl=${reportUrl || 'null'}`);
+            }
+            catch (e3) {
+                logger.error(`[AiAct] Failed to send debug_completed: ${e3.message}`);
+            }
+        };
+        // 安全提取 reportFile 路径，单独 try/catch，绝不向上抛
+        const safeExtractReportFile = () => {
+            try {
+                const agent = session.executor?.getAgent?.() || session.agent;
+                if (agent && typeof agent.reportFile === 'string') {
+                    return agent.reportFile || '';
+                }
+            }
+            catch (e) {
+                logger.warn(`[AiAct] safeExtractReportFile failed: ${e.message}`);
+            }
+            return '';
+        };
         try {
             sessionManager.updateStatus(sessionId, 'running');
             this.sendMessage(ws, { type: 'ai_act_started', sessionId }, request.deviceId);
@@ -789,62 +863,55 @@ export class DebugWebSocketServer {
                 }, { once: true });
             });
             const result = await Promise.race([executePromise, abortPromise]);
-            // 如果是用户主动停止，由 handleStopDebug 统一发送结果消息，此处不再重复发送
+            // 用户主动停止由 handleStopDebug 统一发送结果消息，这里不重复发；同时把 finalSent 置位防止 finally 兜底再发
             if (abortController.signal.aborted) {
+                finalSent = true;
                 logger.info(`[AiAct] Execution aborted by user, skipping result messages (handleStopDebug will send them)`);
                 return;
             }
-            // 清理 executor 引用
             session.executor = undefined;
             const status = result.success ? 'completed' : 'failed';
             sessionManager.updateStatus(sessionId, status);
             logger.info(`[AiAct] Execution finished: sessionId=${sessionId}, status=${status}, ws.readyState=${ws.readyState}`);
-            this.sendMessage(ws, {
-                type: 'ai_act_result',
-                sessionId,
+            const reportFile = result.reportFile || safeExtractReportFile();
+            const reportUrl = await this.safeUploadReport(reportFile, sessionId);
+            sendFinal({
                 success: result.success,
                 result: result.result,
-                dump: result.executionDump || result.dump || '',
-                reportHTML: result.reportHTML || '',
+                reportUrl,
                 error: result.errorMessage,
-            }, request.deviceId);
-            // 发送 debug_completed，让前端能正确识别执行完成状态
-            this.sendMessage(ws, {
-                type: 'debug_completed',
-                sessionId,
-                success: result.success,
-            }, request.deviceId);
-            logger.info(`[AiAct] Sent ai_act_result + debug_completed for sessionId=${sessionId}`);
+            });
         }
         catch (error) {
             session.executor = undefined;
             sessionManager.updateStatus(sessionId, 'failed');
             logger.error(`[AiAct] Execution error: sessionId=${sessionId}, error=${error.message}, ws.readyState=${ws.readyState}`);
-            // 异常时也尝试提取 reportHTML
-            let reportHTML = '';
-            try {
-                const agent = session.executor?.getAgent?.() || session.agent;
-                if (agent && typeof agent.reportHTMLString === 'function') {
-                    reportHTML = agent.reportHTMLString({ inlineScreenshots: true }) || '';
-                }
-            }
-            catch (e) {
-                logger.warn(`[AiAct] Failed to extract reportHTML on error: ${e.message}`);
-            }
-            this.sendMessage(ws, {
-                type: 'ai_act_result',
-                sessionId,
+            const reportFile = safeExtractReportFile();
+            const reportUrl = await this.safeUploadReport(reportFile, sessionId);
+            sendFinal({
                 success: false,
                 error: error.message,
-                reportHTML,
-                dump: '',
-            }, request.deviceId);
-            // 异常时也发送 debug_completed，确保前端能退出执行中状态
-            this.sendMessage(ws, {
-                type: 'debug_completed',
-                sessionId,
-                success: false,
-            }, request.deviceId);
+                reportUrl,
+            });
+        }
+        finally {
+            // 兜底：上面任何分支因任何原因没发结束消息，这里最后补一刀
+            if (!finalSent) {
+                logger.warn(`[AiAct] finally fallback: no final message sent yet for sessionId=${sessionId}, sending now`);
+                const reportFile = safeExtractReportFile();
+                let reportUrl = null;
+                try {
+                    reportUrl = await this.safeUploadReport(reportFile, sessionId);
+                }
+                catch (e) {
+                    logger.error(`[AiAct] finally fallback upload error: ${e.message}`);
+                }
+                sendFinal({
+                    success: false,
+                    error: 'aiAct ended without explicit result (fallback in finally)',
+                    reportUrl,
+                });
+            }
         }
     }
     // ==================== Execute Web Action (Playwright + Midscene, with screencast) ====================
@@ -1152,31 +1219,24 @@ export class DebugWebSocketServer {
                 default:
                     throw new Error(`Unknown web action type: ${request.actionType}`);
             }
-            // 拉取报告
-            let dumpString = '';
-            let reportHTML = '';
+            // 拉取报告文件路径
+            let reportFile = '';
             try {
-                if (typeof agent.dumpDataString === 'function') {
-                    dumpString = agent.dumpDataString({ inlineScreenshots: true });
-                }
-                if (typeof agent.reportHTMLString === 'function') {
-                    reportHTML = agent.reportHTMLString({ inlineScreenshots: true });
+                if (typeof agent.reportFile === 'string') {
+                    reportFile = agent.reportFile || '';
                 }
             }
             catch (e) {
-                logger.warn(`[WebAction] dump/report extract failed: ${e.message}`);
+                logger.warn(`[WebAction] reportFile extract failed: ${e.message}`);
             }
             // runCode 执行中有错误（如断言失败），标记失败但正常返回报告
             const runCodeError = request.__runCodeError;
             const actionSuccess = !runCodeError;
             sessionManager.updateStatus(sessionId, actionSuccess ? 'completed' : 'failed');
             stopWebDumpInterval();
-            // 上传 reportHTML 到服务器，拿到 reportUrl
-            const reportUrl = null;
-            if (reportHTML && reportHTML.length > 0) {
-                // 调试场景不再上传报告到服务端：reportHTML 直接通过长链接回前端
-                logger.info(`[WebAction] Skip server upload (debug mode), reportHTML size=${reportHTML.length}`);
-            }
+            // 上传报告文件到服务端，拿到 reportUrl
+            const reportUrl = await this.safeUploadReport(reportFile, sessionId);
+            logger.info(`[WebAction] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
             // 发送 web_action_result
             this.sendMessage(ws, {
                 type: 'web_action_result',
@@ -1184,8 +1244,7 @@ export class DebugWebSocketServer {
                 actionType: request.actionType,
                 success: actionSuccess,
                 result,
-                dump: dumpString || '',
-                reportHTML: reportHTML || '',
+                dump: '',
                 reportUrl,
                 error: runCodeError || undefined,
             });
@@ -1196,8 +1255,7 @@ export class DebugWebSocketServer {
                 actionType: request.actionType,
                 success: actionSuccess,
                 result,
-                dump: dumpString || '',
-                reportHTML: reportHTML || '',
+                dump: '',
                 reportUrl,
                 error: runCodeError || undefined,
                 platform: 'web',
@@ -1219,41 +1277,28 @@ export class DebugWebSocketServer {
                 clearInterval(session.dumpIntervalId);
                 session.dumpIntervalId = undefined;
             }
-            // 失败时也尝试提取 dump / reportHTML
-            let dumpString = '';
-            let reportHTML = '';
+            // 失败时也尝试提取 reportFile 并上传
+            let reportFile = '';
             const agentForReport = session?.webAgent;
             try {
-                if (agentForReport && typeof agentForReport.dumpDataString === 'function') {
-                    dumpString = agentForReport.dumpDataString({ inlineScreenshots: true });
-                }
-            }
-            catch (dumpErr) {
-                logger.warn(`[WebAction] (error case) dump extract failed: ${dumpErr.message}`);
-            }
-            try {
-                if (agentForReport && typeof agentForReport.reportHTMLString === 'function') {
-                    reportHTML = agentForReport.reportHTMLString({ inlineScreenshots: true });
+                if (agentForReport && typeof agentForReport.reportFile === 'string') {
+                    reportFile = agentForReport.reportFile || '';
                 }
             }
             catch (reportErr) {
-                logger.warn(`[WebAction] (error case) report extract failed: ${reportErr.message}`);
-            }
-            // 异常路径：调试场景不再上传报告到服务端
-            const reportUrl = null;
-            if (reportHTML && reportHTML.length > 0) {
-                logger.info(`[WebAction] (error case) Skip server upload (debug mode), reportHTML size=${reportHTML.length}`);
+                logger.warn(`[WebAction] (error case) reportFile extract failed: ${reportErr.message}`);
             }
+            // 上传报告文件到服务端，拿到 reportUrl
+            const reportUrl = await this.safeUploadReport(reportFile, sessionId);
+            logger.info(`[WebAction] (error case) report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
             this.sendMessage(ws, {
                 type: 'web_action_result',
                 sessionId,
                 actionType: request.actionType,
                 success: false,
                 error: error.message,
-                dump: dumpString || '',
-                reportHTML: reportHTML || '',
+                dump: '',
                 reportUrl,
-                agentStatus: session?.webAgent ? 'initialized' : 'not_initialized',
             });
             // 与移动端对齐：同步发一份 action_result
             this.sendMessage(ws, {
@@ -1262,10 +1307,8 @@ export class DebugWebSocketServer {
                 actionType: request.actionType,
                 success: false,
                 error: error.message,
-                dump: dumpString || '',
-                reportHTML: reportHTML || '',
+                dump: '',
                 reportUrl,
-                agentStatus: session?.webAgent ? 'initialized' : 'not_initialized',
                 platform: 'web',
             });
             // 必须发 debug_completed，前端依赖它退出执行中状态
@@ -1394,26 +1437,16 @@ export class DebugWebSocketServer {
             return;
         }
         // 仿照 playground cancelTask：先获取当前执行数据，再 destroy agent
-        let dump = '';
-        let reportHTML = '';
+        let reportFile = '';
         const agent = session.executor?.getAgent?.() || session.agent;
-        // 获取 dump 数据（必须在 destroy 之前，因为 dump 存储在 agent 内存中）
-        try {
-            if (agent && typeof agent.dumpDataString === 'function') {
-                dump = agent.dumpDataString({ inlineScreenshots: true }) || '';
-            }
-        }
-        catch (error) {
-            logger.warn(`Failed to get dump before cancel: ${error.message}`);
-        }
-        // 获取 reportHTML
+        // 获取 reportFile 路径
         try {
-            if (agent && typeof agent.reportHTMLString === 'function') {
-                reportHTML = agent.reportHTMLString({ inlineScreenshots: true }) || '';
+            if (agent && typeof agent.reportFile === 'string') {
+                reportFile = agent.reportFile || '';
             }
         }
         catch (error) {
-            logger.warn(`Failed to get reportHTML before cancel: ${error.message}`);
+            logger.warn(`Failed to get reportFile before cancel: ${error.message}`);
         }
         // 中断主进程内的执行（execute_action / execute_ai_act）
         if (session.abortController && !session.abortController.signal.aborted) {
@@ -1456,12 +1489,14 @@ export class DebugWebSocketServer {
         // 关闭 web 浏览器（如果存在）
         await this.closeWebSession(request.sessionId);
         sessionManager.updateStatus(request.sessionId, 'stopped');
-        // 发送带执行数据的停止消息（仿照 playground cancel 返回 dump + reportHTML）
+        // 上传报告文件到服务端，拿到 reportUrl
+        const reportUrl = await this.safeUploadReport(reportFile, request.sessionId);
+        logger.info(`[StopDebug] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
+        // 发送带执行数据的停止消息
         this.sendMessage(ws, {
             type: 'debug_stopped',
             sessionId: request.sessionId,
-            dump,
-            reportHTML,
+            reportUrl,
         });
         // 同时发送 action_result，让前端能获取到停止时的执行数据
         this.sendMessage(ws, {
@@ -1469,14 +1504,15 @@ export class DebugWebSocketServer {
             sessionId: request.sessionId,
             success: false,
             error: 'Action stopped by user',
-            dump,
-            reportHTML,
+            dump: '',
+            reportUrl,
         });
         // 发送 debug_completed
         this.sendMessage(ws, {
             type: 'debug_completed',
             sessionId: request.sessionId,
             success: false,
+            reportUrl,
         });
     }
     // ==================== Get Logs ====================
@@ -1489,6 +1525,39 @@ export class DebugWebSocketServer {
         this.sendMessage(ws, { type: 'all_logs', sessionId: request.sessionId, logs: session.logs });
     }
     // ==================== Utilities ====================
+    /**
+     * 安全上传报告到服务端，返回 reportUrl；任何内部异常都 catch 后返回 null，绝不抛
+     */
+    async safeUploadReport(reportFile, sessionId) {
+        if (!reportFile)
+            return null;
+        const uploadUrl = this.config?.callback?.debugReportUploadUrl;
+        if (!uploadUrl) {
+            logger.warn(`[UploadReport] debugReportUploadUrl not configured, skip upload (sessionId=${sessionId})`);
+            return null;
+        }
+        const maxAttempts = 2;
+        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            try {
+                const url = await uploadReportToServer(reportFile, sessionId, uploadUrl);
+                if (url)
+                    return url;
+                // uploadReportToServer 返回 null 说明响应缺少 reportUrl，也算失败，重试一次
+                if (attempt < maxAttempts) {
+                    logger.warn(`[UploadReport] Upload returned no reportUrl (attempt ${attempt}/${maxAttempts}), retrying...`);
+                }
+            }
+            catch (e) {
+                if (attempt < maxAttempts) {
+                    logger.warn(`[UploadReport] Upload failed (attempt ${attempt}/${maxAttempts}): ${e.message}, retrying...`);
+                }
+                else {
+                    logger.error(`[UploadReport] Upload failed after ${maxAttempts} attempts: ${e.message}`);
+                }
+            }
+        }
+        return null;
+    }
     /**
      * 将前端传来的 modelConfig 应用到环境变量
      * ActionExecutor 通过环境变量读取模型配置，所以需要同步更新
@@ -1522,22 +1591,34 @@ export class DebugWebSocketServer {
                 timestamp: new Date().toISOString(),
             };
             if (ws.readyState === ws.OPEN) {
-                const payload = JSON.stringify(msg);
-                // 大数据消息（如 reportHTML）截断，避免超出 WebSocket 帧大小限制
+                let payload = JSON.stringify(msg);
+                // WSS 自身 maxPayload=10MB（接收端），发送端我们保留 2MB 余量以兼容反代/网关
                 const MAX_PAYLOAD_SIZE = 2 * 1024 * 1024; // 2MB
                 if (payload.length > MAX_PAYLOAD_SIZE) {
-                    logger.warn(`[WS] Message too large (${(payload.length / 1024 / 1024).toFixed(2)}MB), type=${message.type}, truncating reportHTML/dump`);
-                    // 截断 reportHTML 和 dump 字段
-                    if (msg.reportHTML && typeof msg.reportHTML === 'string' && msg.reportHTML.length > 512 * 1024) {
-                        msg.reportHTML = msg.reportHTML.substring(0, 512 * 1024) + '\n...[truncated]';
-                    }
+                    const originalSize = payload.length;
+                    let truncated = false;
                     if (msg.dump && typeof msg.dump === 'string' && msg.dump.length > 512 * 1024) {
                         msg.dump = msg.dump.substring(0, 512 * 1024) + '\n...[truncated]';
+                        truncated = true;
+                    }
+                    // 关键修复：截断后必须重新序列化，否则 ws.send 发的还是旧的大 payload
+                    if (truncated) {
+                        payload = JSON.stringify(msg);
+                    }
+                    if (payload.length > MAX_PAYLOAD_SIZE) {
+                        if (msg.dump)
+                            msg.dump = '';
+                        const prevError = typeof msg.error === 'string' ? msg.error : '';
+                        msg.error = (prevError ? prevError + ' | ' : '') + `report dropped (oversize: ${(originalSize / 1024 / 1024).toFixed(2)}MB > ${(MAX_PAYLOAD_SIZE / 1024 / 1024)}MB)`;
+                        msg.reportOversize = true;
+                        msg.reportOversizeBytes = originalSize;
+                        payload = JSON.stringify(msg);
                     }
+                    logger.warn(`[WS] Message too large (orig=${(originalSize / 1024 / 1024).toFixed(2)}MB, sent=${(payload.length / 1024 / 1024).toFixed(2)}MB), type=${message.type}, sessionId=${message.sessionId}`);
                 }
                 ws.send(payload, (err) => {
                     if (err) {
-                        logger.error(`[WS] Send failed: type=${message.type}, error=${err.message}`);
+                        logger.error(`[WS] Send failed: type=${message.type}, sessionId=${message.sessionId}, error=${err.message}`);
                     }
                 });
             }