From 0d2e820118270035fb40df21967806f7784c0ecc Mon Sep 17 00:00:00 2001 From: kicer Date: Mon, 31 Aug 2026 14:23:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A4=E5=A4=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81/=E6=B8=B2=E6=9F=93=20bug=EF=BC=9A1)=20=E5=BC=95?= =?UTF-8?q?=E6=93=8E=20postUserMessage=20=E5=AF=B9=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90/=E5=B7=B2=E5=8F=96=E6=B6=88=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=85=A5=E9=98=9F=E5=90=8E=E5=9B=9E=E8=AF=BB?= =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E7=8A=B6=E6=80=81=E2=80=94=E2=80=94dispatchQ?= =?UTF-8?q?ueued=20=E5=B7=B2=E7=AB=8B=E5=8D=B3=E7=BB=91=E5=AE=9A=E7=A9=BA?= =?UTF-8?q?=E9=97=B2=E6=A8=A1=E5=9E=8B=E6=97=B6=E8=BF=94=E5=9B=9E=20delive?= =?UTF-8?q?red=3Dlive=EF=BC=8C=E5=89=8D=E7=AB=AF=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=AF=AF=E6=98=BE=E3=80=8C=E6=8E=92=E9=98=9F=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E6=9A=82=E5=AD=98=E3=80=8D=E8=AF=AF=E6=A0=87=EF=BC=88=E4=BB=85?= =?UTF-8?q?=E7=9C=9F=E6=8E=92=E9=98=9F=E6=89=8D=E6=98=BE=E7=A4=BA=EF=BC=89?= =?UTF-8?q?=EF=BC=9B2)=20tool=5Fcall=20=E4=B8=8E=20assistant=5Fmessage=20?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=20SSE=20=E4=BA=8B=E4=BB=B6=E6=8C=89=20toolCa?= =?UTF-8?q?rds=20=E6=B3=A8=E5=86=8C=E8=A1=A8=E5=8E=BB=E9=87=8D=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=20id=20=E5=8F=AA=E5=BB=BA=E4=B8=80=E5=BC=A0=E5=8D=A1?= =?UTF-8?q?=EF=BC=8C=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E5=8E=9F=E5=9C=B0?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=8D=E5=86=8D=E6=AE=8B=E7=95=99=E3=80=8C?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=AD=E3=80=8D=E9=87=8D=E5=A4=8D=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/engine.js | 7 ++++--- app/server/public/js/app.js | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/server/engine.js b/app/server/engine.js index 73c8837..91c3f85 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -350,12 +350,13 @@ function postUserMessage(sessionId, content, opts) { runLoop(sessionId); return { message_id: messageId, delivered: 'live' }; } - // 排队 / 已完成 / 已取消 → 重新入队 + // 排队 / 已完成 / 已取消 → 重新入队;若派发后已立即拿到空闲模型,则算直接送达 touch(sessionId, { status: 'queued', cancelled_at: null, completed_at: null }); enqueue(sessionId); - emitStatus(sessionId); dispatchQueued(); - return { message_id: messageId, delivered: 'queued' }; + const after = getSession(sessionId); + emitStatus(sessionId); + return { message_id: messageId, delivered: after && after.status === 'active' ? 'live' : 'queued' }; } function startExecution(sessionId) { diff --git a/app/server/public/js/app.js b/app/server/public/js/app.js index c0859b7..7dd2582 100644 --- a/app/server/public/js/app.js +++ b/app/server/public/js/app.js @@ -202,6 +202,7 @@ function appendToolCardsFromAssistant(m, container) { try { calls = typeof m.tool_calls === 'string' ? JSON.parse(m.tool_calls) : m.tool_calls; } catch (_) { return; } for (const c of calls) { const id = c.id || ('c' + Math.random().toString(36).slice(2, 10)); + if (state.toolCards[id]) continue; // tool_call 事件已经建过同一张卡,不重复创建 const card = renderToolCard(id, c.function.name, c.function.arguments); container.appendChild(card); state.toolCards[id] = card; @@ -282,6 +283,7 @@ function connectStream() { }); es.addEventListener('tool_call', ev => { const d = JSON.parse(ev.data); + if (state.toolCards[d.id]) return; // assistant_message 已建卡(含完整参数),不重复创建 const card = renderToolCard(d.id, d.name, d.arguments); $('messages').appendChild(card); state.toolCards[d.id] = card;