From 62c114258cddc9000fce89a0075f38b66b288580 Mon Sep 17 00:00:00 2001 From: kicer Date: Thu, 10 Sep 2026 09:46:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=AA=8C=EF=BC=9Atool=5Fcall=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B5=81=E5=BC=8F=E6=97=A9=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E2=80=94=E2=80=94id+name=20=E5=B0=B1=E7=BB=AA=E5=8D=B3?= =?UTF-8?q?=E5=BB=BA=E5=8D=A1=EF=BC=8C=E5=8F=82=E6=95=B0=E7=A2=8E=E7=89=87?= =?UTF-8?q?=E5=A2=9E=E9=87=8F=E4=B8=8B=E5=8F=91=E5=AE=9E=E6=97=B6=E5=A1=AB?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - llm.js callModel:tool_call 碎片凑齐 id+name 时触发 onToolCallStart,其后参数按增量触发 onToolCallArgs(announced/announcedLen 按 slot 去重) - engine.js streamAssistant:接回调广播 tool_call_start / tool_call_args 两个 SSE 事件 - 前端:tool_call_start 即建展开态「生成参数中…」早卡(顺带解决原 tool_call 事件因 assistant_message 先建卡而永远收起的问题);tool_call_args 150ms 节流流式填参数区+字符计数 - 收尾:assistant_message / 执行时 tool_call 带完整(解包后)参数回填 finalizeToolCardArgs;done 异常兜底回填,防占位态永久呼吸;toolCallStreaming 随会话/回合各处重置 - CSS:.tool-generating 的 ◌ 呼吸动画 - 修复写坏的复制按钮 SVG path(上一轮 fuzzy 编辑吞字),与 HEAD 比对还原 --- app/server/engine.js | 3 ++ app/server/llm.js | 18 ++++++++ app/server/public/css/style.css | 4 ++ app/server/public/index.html | 73 ++++++++++++++++++++++++++++++--- 4 files changed, 93 insertions(+), 5 deletions(-) diff --git a/app/server/engine.js b/app/server/engine.js index 1a6438f..2e5d15a 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -630,6 +630,9 @@ async function streamAssistant(sessionId, run, session, messages, tools) { shouldCancel: () => run.cancelled, onText: delta => bus.emit(sessionId, 'assistant_delta', { text: delta }), onReasoning: delta => bus.emit(sessionId, 'reasoning_delta', { text: delta }), + // 工具调用早反馈:id+name 就绪即建卡,参数碎片流式下发(长参数生成期间前端不再空等) + onToolCallStart: t => bus.emit(sessionId, 'tool_call_start', { id: t.id, name: t.name }), + onToolCallArgs: t => bus.emit(sessionId, 'tool_call_args', { id: t.id, args: t.args }), // 本轮是否启用深度思考;由 postUserMessage 从消息 POST 参数写进 run deepThink: !!run.deepThink, onMeta: handleSseMeta, diff --git a/app/server/llm.js b/app/server/llm.js index 891f8e1..6ef1ff6 100644 --- a/app/server/llm.js +++ b/app/server/llm.js @@ -261,6 +261,8 @@ function deepMergeInto(dst, src) { // 调模型一次。onText(textDelta) 回调流式文本。 // 返回 { content, tool_calls: [{id,name,arguments(string)}], finish_reason, usage, aborted } +// 可选回调 opts.onToolCallStart({id,name}):某 tool_call 首次凑齐 id+name 时触发一次; +// opts.onToolCallArgs({id,args}):此后该调用每段参数增量各触发一次(供前端流式渲染)。 // options.deepThink: true 时将 modelCfg.thinking_params 合并进 body。 async function callModel(cfg, modelId, messages, tools, options) { const opts = options || {}; @@ -319,6 +321,8 @@ async function callModel(cfg, modelId, messages, tools, options) { let aborted = false; let sseFrames = 0; // 收到的上游 data 帧数(仅计数成功下传到 onEvent 的) const toolCalls = new Map(); // index -> {id, name, arguments} + const announced = new Set(); // 已早广播的 slot idx(id+name 就绪即通知前端建卡,不等整轮生成完) + const announcedLen = new Map(); // idx -> 已转发的参数字符数(参数碎片只发增量,不重复全量) try { await forEachSSEData(res, evt => { @@ -355,6 +359,20 @@ async function callModel(cfg, modelId, messages, tools, options) { if (tc.function.name) acc.name += tc.function.name; if (tc.function.arguments) acc.arguments += tc.function.arguments; } + // 早反馈:id+name 就绪即通知前端建卡(写大文件等长参数生成期间不再静默如卡死); + // 其后参数碎片按增量转发(流式填「生成参数中」卡片)。 + if (acc.id && acc.name && !announced.has(idx)) { + announced.add(idx); + announcedLen.set(idx, acc.arguments.length); + if (opts.onToolCallStart) opts.onToolCallStart({ id: acc.id, name: acc.name }); + } + if (announced.has(idx) && opts.onToolCallArgs) { + const from = announcedLen.get(idx) || 0; + if (acc.arguments.length > from) { + announcedLen.set(idx, acc.arguments.length); + opts.onToolCallArgs({ id: acc.id, args: acc.arguments.slice(from) }); + } + } } }, opts.onMeta, diff --git a/app/server/public/css/style.css b/app/server/public/css/style.css index 630b24a..2706584 100644 --- a/app/server/public/css/style.css +++ b/app/server/public/css/style.css @@ -288,6 +288,10 @@ footer { flex: none; padding: 8px 12px calc(10px + env(safe-area-inset-bottom, 0 } .attach-chip .name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 140px; } .attach-chip .rm { color: var(--gray); display: flex; } +/* 工具卡参数流式生成中:◌ 呼吸提示(收尾后随 .tool-generating 移除) */ +.tool-card.tool-generating .spin { display: inline-block; color: var(--active); animation: tool-gen-pulse 1s ease-in-out infinite; } +@keyframes tool-gen-pulse { 0%, 100% { opacity: 1 } 50% { opacity: .2 } } + /* 上传文件卡片行(嵌在输入框内部顶端,由 .input-shell 的 gap 提供间距;逐卡进度遮罩;卡多时横向滚动) */ .up-cards { display: flex; gap: 6px; diff --git a/app/server/public/index.html b/app/server/public/index.html index bcf2add..87da4a5 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -483,6 +483,7 @@ streamReasoning: '', // 当前流式累积思考文本 streamThinkEl: null, // 当前流式思考面板的 body 节点(未出现思考时为 null) toolCards: {}, // tool_call_id -> 工具卡片元素(同步 index 工具卡样式) + toolCallStreaming: {}, // tool_call_id -> {name, args}:参数流式生成中的累积态(早建卡卡面实时填充) toolCallMsgIds: {}, // tool_call_id -> tool 消息行 id(历史懒加载映射,renderDetail 重建) typingEl: null, // 「思考中」占位 streaming: false, @@ -664,16 +665,30 @@ // 流式执行(open=true):结果在 tool-result 里增量填入,展开才能看到实时输出,回合结束也别自动折上。 // 历史重渲染(默认 open=false):保持原来的收起观感,用户点 summary 再展开。 const open = !!(opts && opts.open); + // generating=true:tool_call 参数流式生成中的早卡,占位提示由 finalizeToolCardArgs 替换为完整参数 + const gen = !!(opts && opts.generating); + if (gen) div.classList.add('tool-generating'); div.innerHTML = '◌' + '' + esc(name) + '' + - '' + esc(toolArgsSummary(name, argsStr)) + '' + - '
' + esc(toolArgsFull(argsStr)) + '
' + + '' + (gen ? '生成参数中…' : esc(toolArgsSummary(name, argsStr))) + '' + + '
' + (gen ? '' : esc(toolArgsFull(argsStr))) + '
' + '
执行中…
' + // 时间行/复制按钮在折叠体内:展开卡片才可见 '
' + fmtTime(createdAt || Date.now()) + '
'; return div; } + // 早卡收尾:回填完整参数、清「生成中」态(assistant_message / 执行时 tool_call 事件都会接手) + function finalizeToolCardArgs(id, name, argsStr) { + delete state.toolCallStreaming[id]; + const card = state.toolCards[id]; + if (!card || !card.classList.contains('tool-generating')) return; + card.classList.remove('tool-generating'); + const argsEl = card.querySelector('.tool-args'); + if (argsEl) argsEl.textContent = toolArgsSummary(name || '', argsStr || ''); + const fullEl = card.querySelector('.tool-args-full'); + if (fullEl) fullEl.textContent = toolArgsFull(argsStr || ''); + } // tool 消息 content:纯文本,或含图片时的哨兵 JSON {"__blocks__":[...]}(read_file 读图回传) // 顺手剥掉旧数据里的「,图片见同条消息的 image_url 内容块」尾巴(新版文案已去掉,历史行还在库里) function parseToolContent(content) { @@ -725,7 +740,10 @@ 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 事件已经建过同一张卡,不重复创建 + if (state.toolCards[id]) { // 早卡(流式生成中):回填完整参数收尾;否则跳过不重复建卡 + finalizeToolCardArgs(id, c.function && c.function.name, c.function && c.function.arguments); + continue; + } const card = renderToolCard(id, c.function && c.function.name || '工具', c.function && c.function.arguments, m.created_at); container.appendChild(card); state.toolCards[id] = card; @@ -813,6 +831,7 @@ state.sessionType = (s && s.assistant_type) || 'secretary'; // 顶部 icon 跟随会话类型 state.status = (s && s.status) || ''; state.toolCards = {}; + state.toolCallStreaming = {}; // 流式参数早卡映射随会话/回合重置 state.toolCallMsgIds = {}; // tool_call.id → tool 消息行 id(展开时懒加载用) userPaused = false; removeTyping(); @@ -1064,6 +1083,7 @@ state.streamEl = null; state.streamText = ''; state.toolCards = {}; + state.toolCallStreaming = {}; // 流式参数早卡映射随会话/回合重置 state.streaming = false; setView('welcome'); // 复用 newChat 同样的视图切换路径 } @@ -1093,6 +1113,7 @@ state.streamWrap = null; state.lastAssistantMsgId = null; state.toolCards = {}; + state.toolCallStreaming = {}; // 流式参数早卡映射随会话/回合重置 state.streaming = false; state.attachments = []; userPaused = false; @@ -1140,6 +1161,7 @@ state.streamEl = null; state.streamText = ''; state.toolCards = {}; + state.toolCallStreaming = {}; // 流式参数早卡映射随会话/回合重置 state.streaming = false; userPaused = false; renderAttachChips(); @@ -1629,11 +1651,46 @@ if (cpBtn) cpBtn.disabled = state.status === 'active'; } }); + // 参数流式生成早卡:id+name 就绪即建卡展开,长参数(write_file 大文件)期间不再是死寂 typing + es.addEventListener('tool_call_start', ev => { + const d = JSON.parse(ev.data); + removeTyping(); + if (state.toolCards[d.id]) return; // 重连/重复广播防御 + state.toolCallStreaming[d.id] = { name: d.name || '', args: '' }; + const card = renderToolCard(d.id, d.name, '', Date.now(), { open: true, generating: true }); + $('chat-view').appendChild(card); + state.toolCards[d.id] = card; + maybeAutoScroll(); + }); + es.addEventListener('tool_call_args', ev => { + const d = JSON.parse(ev.data); + const st = state.toolCallStreaming[d.id]; + if (!st) return; // 未建早卡(无 id/name 或已收尾)则丢弃,收尾后残留碎片自然忽略 + st.args += d.args || ''; + const card = state.toolCards[d.id]; + if (!card) return; + if (card.dataset.painting) return; // 150ms 合并重绘:超大参数不逐帧刷 + card.dataset.painting = '1'; + setTimeout(() => { + delete card.dataset.painting; + if (!card.isConnected || !state.toolCallStreaming[d.id]) return; + const fullEl = card.querySelector('.tool-args-full'); + if (fullEl) { fullEl.textContent = st.args; fullEl.scrollTop = fullEl.scrollHeight; } + const argsEl = card.querySelector('.tool-args'); + const n = st.args.length; + if (argsEl) argsEl.textContent = '生成参数中… ' + (n >= 1024 ? (n / 1024).toFixed(1) + 'k 字符' : n + ' 字符'); + maybeAutoScroll(); + }, 150); + }); es.addEventListener('tool_call', ev => { const d = JSON.parse(ev.data); removeTyping(); // 工具卡出现也算即时反馈 - if (state.toolCards[d.id]) return; // assistant_message 已建卡(含完整参数),不重复创建 - // 流式 tool_call:展开卡片,实时看到执行参数与结果,回合结束也不自动折上 + if (state.toolCards[d.id]) { + // 执行时的完整参数事件:若为流式早卡则回填收尾(unwrap 后的干净参数),普通卡不动 + finalizeToolCardArgs(d.id, d.name, d.arguments); + return; + } + // 无早卡(旧行为/刷新后重连):直接建展开卡 const card = renderToolCard(d.id, d.name, d.arguments, Date.now(), { open: true }); $('chat-view').appendChild(card); state.toolCards[d.id] = card; @@ -1661,7 +1718,13 @@ state.streamWrap = null; state.streamReasoning = ''; state.streamThinkEl = null; + // 异常收尾兜底:把参数未流完的早卡就地回填收尾,避免占位态永远呼吸 + for (const sid of Object.keys(state.toolCallStreaming)) { + const stg = state.toolCallStreaming[sid]; + finalizeToolCardArgs(sid, stg.name, stg.args); + } state.toolCards = {}; + state.toolCallStreaming = {}; // 流式参数早卡映射随会话/回合重置 updateScrollBottomBtn(); loadSessionList(); });