diff --git a/app/server/db.js b/app/server/db.js index 30861f4..9be42d1 100644 --- a/app/server/db.js +++ b/app/server/db.js @@ -29,12 +29,15 @@ function initDb(dbPath) { session_id TEXT NOT NULL, role TEXT NOT NULL, content TEXT, + reasoning TEXT, tool_calls TEXT, tool_call_id TEXT, name TEXT, created_at INTEGER NOT NULL, FOREIGN KEY (session_id) REFERENCES sessions(id) ); + // 升级老库:早期表不带 reasoning 列,补上(重入安全) + try { db.exec('ALTER TABLE messages ADD COLUMN reasoning TEXT'); } catch (_) { /* 已存在 */ } CREATE TABLE IF NOT EXISTS files ( id INTEGER PRIMARY KEY AUTOINCREMENT, diff --git a/app/server/engine.js b/app/server/engine.js index 7b01038..45c3c00 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -75,8 +75,8 @@ function loadHistory(sessionId) { function saveMessage(sessionId, msg) { const info = db.prepare( - 'INSERT INTO messages (session_id, role, content, tool_calls, tool_call_id, name, created_at) VALUES (?,?,?,?,?,?,?)' - ).run(sessionId, msg.role, msg.content || null, + 'INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, name, created_at) VALUES (?,?,?,?,?,?,?,?)' + ).run(sessionId, msg.role, msg.content || null, msg.reasoning || null, msg.tool_calls ? JSON.stringify(msg.tool_calls) : null, msg.tool_call_id || null, msg.name || null, now()); // 关键动作日志:AI 每轮回复落库(含纯工具调用轮) @@ -476,6 +476,7 @@ async function runLoopInner(sessionId, run) { const msgRow = { role: 'assistant', content: result.content || '', + reasoning: result.reasoning || null, tool_calls: hasTools ? result.tool_calls.map(tc => ({ id: tc.id, type: 'function', function: { name: tc.name, arguments: tc.arguments }, @@ -483,7 +484,7 @@ async function runLoopInner(sessionId, run) { }; const assistantId = saveMessage(sessionId, msgRow); recordModelUsage(sessionId, session.model_id, result.usage); - bus.emit(sessionId, 'assistant_message', { id: assistantId, content: msgRow.content, tool_calls: msgRow.tool_calls }); + bus.emit(sessionId, 'assistant_message', { id: assistantId, content: msgRow.content, reasoning: msgRow.reasoning, tool_calls: msgRow.tool_calls }); if (!hasTools) { // 回合结束;但若期间用户又发了新消息(live 投递),继续下一轮而不是收尾 @@ -562,6 +563,7 @@ async function streamAssistant(sessionId, run, session, messages, tools) { signal: run.abortController.signal, shouldCancel: () => run.cancelled, onText: delta => bus.emit(sessionId, 'assistant_delta', { text: delta }), + onReasoning: delta => bus.emit(sessionId, 'reasoning_delta', { text: delta }), // 本轮是否启用深度思考;由 postUserMessage 从消息 POST 参数写进 run deepThink: !!run.deepThink, }); diff --git a/app/server/llm.js b/app/server/llm.js index 3cb0da1..db97f61 100644 --- a/app/server/llm.js +++ b/app/server/llm.js @@ -160,6 +160,7 @@ async function callModel(cfg, modelId, messages, tools, options) { } let content = ''; + let reasoning = ''; let finishReason = null; let usage = null; let aborted = false; @@ -177,6 +178,14 @@ async function callModel(cfg, modelId, messages, tools, options) { content += delta.content; if (opts.onText) opts.onText(delta.content); } + // 思考/推理字段:各家上游不一致,同时支持 reasoning 和 reasoning_content;只走一个,优先级 reasoning + const rPiece = (typeof delta.reasoning === 'string' && delta.reasoning) + || (typeof delta.reasoning_content === 'string' && delta.reasoning_content) + || ''; + if (rPiece) { + reasoning += rPiece; + if (opts.onReasoning) opts.onReasoning(rPiece); + } for (const tc of delta.tool_calls || []) { const idx = tc.index || 0; if (!toolCalls.has(idx)) toolCalls.set(idx, { id: '', name: '', arguments: '' }); @@ -193,7 +202,7 @@ async function callModel(cfg, modelId, messages, tools, options) { } if (opts.shouldCancel && opts.shouldCancel()) aborted = true; - return { content, 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 }; } module.exports = { callModel, buildMessages, buildSystemPrompt, systemPromptText, encodeBlocks, decodeBlocks }; diff --git a/app/server/public/css/style.css b/app/server/public/css/style.css index 3e66737..6a254a7 100644 --- a/app/server/public/css/style.css +++ b/app/server/public/css/style.css @@ -125,6 +125,37 @@ main { flex: 1; min-height: 0; display: flex; flex-direction: column; } .msg.me { align-items: flex-end; } .msg.other { align-items: flex-start; } +/* 思考过程折叠面板:位于 AI 气泡上方。summary 小圆点+灰文字,body 等宽字体淡背景 */ +.msg-think { + width: 100%; max-width: 100%; + margin: 0 0 6px; padding: 0; + background: var(--surface); border: 1px solid var(--border); border-radius: 10px; + font-size: 13px; color: var(--ink); + overflow: hidden; +} +.msg-think > summary { + list-style: none; cursor: pointer; user-select: none; + padding: 6px 10px; display: flex; align-items: center; gap: 6px; + color: var(--gray); font-size: 12px; +} +.msg-think > summary::-webkit-details-marker { display: none; } +.msg-think > summary::before { + content: '▸'; font-size: 10px; color: var(--gray-light); + transition: transform .15s; display: inline-block; +} +.msg-think[open] > summary::before { transform: rotate(90deg); } +.msg-think-body { + padding: 4px 12px 10px; + font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; + font-size: 12.5px; line-height: 1.55; + color: var(--ink); white-space: pre-wrap; word-break: break-word; + max-height: 360px; overflow-y: auto; + border-top: 1px solid var(--border); + background: #fafbfd; +} +/* 流式阶段给一点视觉提示:边色稍亮,收尾(assistant_message)后去除 */ +.msg-think.streaming { border-color: #d8e0f5; } + /* 用户气泡:右侧,浅色背景,圆角矩形 */ .bubble-user { background: var(--active-soft); color: var(--ink); diff --git a/app/server/public/index.html b/app/server/public/index.html index 650920f..a571dca 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -363,6 +363,9 @@ es: null, // EventSource streamText: '', // 当前流式累积文本 streamEl: null, // 当前流式 AI 气泡 + streamWrap: null, // 当前流式消息容器(.msg.other);思考面板与气泡都挂它上面 + streamReasoning: '', // 当前流式累积思考文本 + streamThinkEl: null, // 当前流式思考面板的 body 节点(未出现思考时为 null) toolCards: {}, // tool_call_id -> 工具卡片元素(同步 index 工具卡样式) typingEl: null, // 「思考中」占位 streaming: false, @@ -444,13 +447,16 @@ } function aiMsgHtml(m) { - const hasText = !!(m.content && m.content.trim()); - if (!hasText) return null; // 纯工具调用的应答:不渲染空气泡,工具卡由 appendToolCardsFromAssistant 铺 - const r = mdHtml(m.content); - return '