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;