diff --git a/app/server/engine.js b/app/server/engine.js index cb9a8c0..c675f2d 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -552,7 +552,7 @@ async function runLoopInner(sessionId, run) { async function streamAssistant(sessionId, run, session, messages, tools) { run.abortController = new AbortController(); try { - return await callModel(cfg, session.model_id, messages, tools, { + const result = await callModel(cfg, session.model_id, messages, tools, { signal: run.abortController.signal, shouldCancel: () => run.cancelled, onText: delta => bus.emit(sessionId, 'assistant_delta', { text: delta }), @@ -564,6 +564,13 @@ async function streamAssistant(sessionId, run, session, messages, tools) { onMeta: line => log.debug('[sse] ' + sessionId + ' ' + line), onBadData: raw => log.warn('[sse] ' + sessionId + ' 坏帧:' + raw.slice(0, 200)), }); + // 本轮上游响应总览:帧数 + 文本长度 + 工具调用 + finish + aborted。 + // sseFrames=0 且 aborted=false 表示上游未发任何 data(疑似流异常);其他情况可快速区分 + // “上游发了一堆帧但 content 为空” 与 “根本没调用成功”。 + log.info('[sse] ' + sessionId + ' 本轮汇总:帧 ' + (result && result.sseFrames || 0) + + ',finish=' + (result && result.finish_reason || '-') + + ',aborted=' + (result && result.aborted || false)); + return result; } finally { run.abortController = null; } diff --git a/app/server/llm.js b/app/server/llm.js index a97060a..ddd428d 100644 --- a/app/server/llm.js +++ b/app/server/llm.js @@ -178,10 +178,12 @@ async function callModel(cfg, modelId, messages, tools, options) { let finishReason = null; let usage = null; let aborted = false; + let sseFrames = 0; // 收到的上游 data 帧数(仅计数成功下传到 onEvent 的) const toolCalls = new Map(); // index -> {id, name, arguments} try { await forEachSSEData(res, evt => { + sseFrames++; if (opts.shouldCancel && opts.shouldCancel()) { aborted = true; controller.abort(); return; } if (evt.usage) usage = evt.usage; const choice = evt.choices && evt.choices[0]; @@ -216,7 +218,7 @@ async function callModel(cfg, modelId, messages, tools, options) { } if (opts.shouldCancel && opts.shouldCancel()) aborted = true; - return { content, reasoning, tool_calls: Array.from(toolCalls.values()), finish_reason: finishReason, usage, aborted }; + return { content, reasoning, tool_calls: Array.from(toolCalls.values()), finish_reason: finishReason, usage, aborted, sseFrames }; } module.exports = { callModel, buildMessages, buildSystemPrompt, systemPromptText, encodeBlocks, decodeBlocks };