功能:接入 prompt_tokens_details.cached_tokens,消息与模型统计展示缓存命中

- engine: assistant 落库与 SSE 事件带 usage {pt,ct,cached}(上游未报 details 时 cached=null 区分未上报与 0 命中);recordModelUsage 写 cached_tokens;modelUsageStats 聚合 today_cached/total_cached
- db: messages 加 usage TEXT、model_usage 加 cached_tokens 列(建表+迁移双路径,幂等)
- server: /api/pool 统计行透传 today_cached/total_cached
- 前端 msg-actions: 时间戳后新增「In: 1.2k/95%, Out: 456」小字(title 显示精确 tok 数),历史/SSE/摘要卡片三处渲染同参
- 模型卡新增「缓存命中」行:累计缓存 tok · 历史命中率(累计缓存÷累计输入)
This commit is contained in:
2026-09-10 09:17:45 +08:00
parent d3e64c8a2f
commit 695abf1f6a
5 changed files with 49 additions and 14 deletions
+5
View File
@@ -47,6 +47,8 @@ function initDb(dbPath) {
try { db.exec('ALTER TABLE messages ADD COLUMN type TEXT'); } catch (_) { /* 已存在 */ } try { db.exec('ALTER TABLE messages ADD COLUMN type TEXT'); } catch (_) { /* 已存在 */ }
// 升级老库:tool 回执执行失败标记。此前只走 SSE 不落库,重进会话后 UI 丢失红色错误样式 // 升级老库:tool 回执执行失败标记。此前只走 SSE 不落库,重进会话后 UI 丢失红色错误样式
try { db.exec('ALTER TABLE messages ADD COLUMN is_error INTEGER NOT NULL DEFAULT 0'); } catch (_) { /* 已存在 */ } try { db.exec('ALTER TABLE messages ADD COLUMN is_error INTEGER NOT NULL DEFAULT 0'); } catch (_) { /* 已存在 */ }
// 升级老库:assistant 消息的 token 用量 {pt,ct,cached} JSON(msg-actions 展示 In/Out/缓存命中率)
try { db.exec('ALTER TABLE messages ADD COLUMN usage TEXT'); } catch (_) { /* 已存在 */ }
db.exec(` db.exec(`
CREATE TABLE IF NOT EXISTS files ( CREATE TABLE IF NOT EXISTS files (
@@ -87,6 +89,7 @@ function initDb(dbPath) {
prompt_tokens INTEGER DEFAULT 0, prompt_tokens INTEGER DEFAULT 0,
completion_tokens INTEGER DEFAULT 0, completion_tokens INTEGER DEFAULT 0,
total_tokens INTEGER DEFAULT 0, total_tokens INTEGER DEFAULT 0,
cached_tokens INTEGER DEFAULT 0,
created_at INTEGER NOT NULL created_at INTEGER NOT NULL
); );
@@ -94,6 +97,8 @@ function initDb(dbPath) {
CREATE INDEX IF NOT EXISTS idx_files_session ON files(session_id); CREATE INDEX IF NOT EXISTS idx_files_session ON files(session_id);
CREATE INDEX IF NOT EXISTS idx_model_usage_model_time ON model_usage(model_id, created_at); CREATE INDEX IF NOT EXISTS idx_model_usage_model_time ON model_usage(model_id, created_at);
`); `);
// 升级老库:model_usage 补 cached_tokens 列(输入 token 缓存命中量累计,算历史命中率)
try { db.exec('ALTER TABLE model_usage ADD COLUMN cached_tokens INTEGER DEFAULT 0'); } catch (_) { /* 已存在 */ }
// 迁移:旧库补 held_at 列(held 保持租约起始时间) // 迁移:旧库补 held_at 列(held 保持租约起始时间)
const cols = db.prepare('PRAGMA table_info(sessions)').all(); const cols = db.prepare('PRAGMA table_info(sessions)').all();
if (!cols.some(c => c.name === 'held_at')) db.exec('ALTER TABLE sessions ADD COLUMN held_at INTEGER'); if (!cols.some(c => c.name === 'held_at')) db.exec('ALTER TABLE sessions ADD COLUMN held_at INTEGER');
+21 -9
View File
@@ -66,10 +66,11 @@ function loadHistory(sessionId) {
function saveMessage(sessionId, msg) { function saveMessage(sessionId, msg) {
const info = db.prepare( const info = db.prepare(
'INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, name, type, is_error, created_at) VALUES (?,?,?,?,?,?,?,?,?,?)' 'INSERT INTO messages (session_id, role, content, reasoning, tool_calls, tool_call_id, name, type, is_error, usage, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)'
).run(sessionId, msg.role, msg.content || null, msg.reasoning || null, ).run(sessionId, msg.role, msg.content || null, msg.reasoning || null,
msg.tool_calls ? JSON.stringify(msg.tool_calls) : null, msg.tool_calls ? JSON.stringify(msg.tool_calls) : null,
msg.tool_call_id || null, msg.name || null, msg.type || null, msg.is_error ? 1 : 0, msg.created_at || now()); msg.tool_call_id || null, msg.name || null, msg.type || null, msg.is_error ? 1 : 0,
msg.usage ? JSON.stringify(msg.usage) : null, msg.created_at || now());
// 关键动作日志:AI 每轮回复落库(含纯工具调用轮) // 关键动作日志:AI 每轮回复落库(含纯工具调用轮)
if (msg.role === 'assistant') { if (msg.role === 'assistant') {
const calls = msg.tool_calls || []; const calls = msg.tool_calls || [];
@@ -90,37 +91,41 @@ function saveMessage(sessionId, msg) {
// 记录一次模型回合的 token 用量(上游未返回 usage 时跳过)。 // 记录一次模型回合的 token 用量(上游未返回 usage 时跳过)。
// 写入 model_usage 表,不建会话外键:删会话后累计统计仍保留。 // 写入 model_usage 表,不建会话外键:删会话后累计统计仍保留。
// cached_tokens:上游 prompt_tokens_details.cached_tokens(输入前缀缓存命中量,部分上游不报)。
function recordModelUsage(sessionId, modelId, usage) { function recordModelUsage(sessionId, modelId, usage) {
if (!modelId || !usage) return; if (!modelId || !usage) return;
const pt = usage.prompt_tokens || 0; const pt = usage.prompt_tokens || 0;
const ct = usage.completion_tokens || 0; const ct = usage.completion_tokens || 0;
const tt = usage.total_tokens || (pt + ct); const tt = usage.total_tokens || (pt + ct);
const cached = (usage.prompt_tokens_details && usage.prompt_tokens_details.cached_tokens) || 0;
if (!pt && !ct && !tt) return; if (!pt && !ct && !tt) return;
db.prepare( db.prepare(
'INSERT INTO model_usage (session_id, model_id, prompt_tokens, completion_tokens, total_tokens, created_at) VALUES (?,?,?,?,?,?)' 'INSERT INTO model_usage (session_id, model_id, prompt_tokens, completion_tokens, total_tokens, cached_tokens, created_at) VALUES (?,?,?,?,?,?,?)'
).run(sessionId, modelId, pt, ct, tt, now()); ).run(sessionId, modelId, pt, ct, tt, cached, now());
} }
// 每模型 token 用量统计:今日(本地时区自然日起)+ 累计,输入/输出分开。 // 每模型 token 用量统计:今日(本地时区自然日起)+ 累计,输入/输出/缓存命中分开。
// 返回 { [model_id]: { today_prompt, today_completion, total_prompt, total_completion } }, // 返回 { [model_id]: { today_prompt, today_completion, today_cached, total_prompt, total_completion, total_cached } },
// 配置内的模型保证有零值占位。 // 配置内的模型保证有零值占位。
function modelUsageStats() { function modelUsageStats() {
const d = new Date(); const d = new Date();
const dayStart = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime(); const dayStart = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
const stats = {}; const stats = {};
const slot = function (id) { const slot = function (id) {
if (!stats[id]) stats[id] = { today_prompt: 0, today_completion: 0, total_prompt: 0, total_completion: 0 }; if (!stats[id]) stats[id] = { today_prompt: 0, today_completion: 0, today_cached: 0, total_prompt: 0, total_completion: 0, total_cached: 0 };
return stats[id]; return stats[id];
}; };
for (const m of cfg.models) slot(m.id); for (const m of cfg.models) slot(m.id);
const sumSql = 'SELECT model_id, SUM(prompt_tokens) AS p, SUM(completion_tokens) AS c FROM model_usage'; const sumSql = 'SELECT model_id, SUM(prompt_tokens) AS p, SUM(completion_tokens) AS c, SUM(cached_tokens) AS k FROM model_usage';
for (const r of db.prepare(sumSql + ' WHERE created_at >= ? GROUP BY model_id').all(dayStart)) { for (const r of db.prepare(sumSql + ' WHERE created_at >= ? GROUP BY model_id').all(dayStart)) {
slot(r.model_id).today_prompt = r.p || 0; slot(r.model_id).today_prompt = r.p || 0;
slot(r.model_id).today_completion = r.c || 0; slot(r.model_id).today_completion = r.c || 0;
slot(r.model_id).today_cached = r.k || 0;
} }
for (const r of db.prepare(sumSql + ' GROUP BY model_id').all()) { for (const r of db.prepare(sumSql + ' GROUP BY model_id').all()) {
slot(r.model_id).total_prompt = r.p || 0; slot(r.model_id).total_prompt = r.p || 0;
slot(r.model_id).total_completion = r.c || 0; slot(r.model_id).total_completion = r.c || 0;
slot(r.model_id).total_cached = r.k || 0;
} }
return stats; return stats;
} }
@@ -480,6 +485,13 @@ async function runLoopInner(sessionId, run) {
})) : null, })) : null,
// 落库与 SSE 事件共用同一时间戳:前端流式收尾时直接拿来渲染时间行,重进会话后时刻不跳变 // 落库与 SSE 事件共用同一时间戳:前端流式收尾时直接拿来渲染时间行,重进会话后时刻不跳变
created_at: now(), created_at: now(),
// token 用量快照(msg-actions 展示 In/Out/命中率):上游不报 details 时 cached 置 null 以区分“未报”与“0 命中”
usage: result.usage ? {
pt: result.usage.prompt_tokens || 0,
ct: result.usage.completion_tokens || 0,
cached: result.usage.prompt_tokens_details
? (result.usage.prompt_tokens_details.cached_tokens || 0) : null,
} : null,
}; };
const assistantId = saveMessage(sessionId, msgRow); const assistantId = saveMessage(sessionId, msgRow);
if (isErrAck) log.info('msg', sessionId + ' 本轮 tool call 参数错误,assistant 标记 errAck(不再进入模型上下文)'); if (isErrAck) log.info('msg', sessionId + ' 本轮 tool call 参数错误,assistant 标记 errAck(不再进入模型上下文)');
@@ -491,7 +503,7 @@ async function runLoopInner(sessionId, run) {
bus.emit(sessionId, 'assistant_message', { bus.emit(sessionId, 'assistant_message', {
id: assistantId, content: msgRow.content, reasoning: msgRow.reasoning, id: assistantId, content: msgRow.content, reasoning: msgRow.reasoning,
tool_calls: msgRow.tool_calls, type: msgRow.type, created_at: msgRow.created_at, tool_calls: msgRow.tool_calls, type: msgRow.type, created_at: msgRow.created_at,
is_summary: isSummary, usage: msgRow.usage, is_summary: isSummary,
}); });
if (isSummary) { if (isSummary) {
// 摘要落地:这条收尾答复在库里标成 type='summary' // 摘要落地:这条收尾答复在库里标成 type='summary'
+2
View File
@@ -268,6 +268,8 @@ main { flex: 1; min-height: 0; display: flex; flex-direction: column; }
margin-top: 6px; font-size: 12px; color: var(--gray-light); margin-top: 6px; font-size: 12px; color: var(--gray-light);
} }
.msg-actions .act { display: flex; color: var(--gray-light); padding: 3px; border-radius: 6px; } .msg-actions .act { display: flex; color: var(--gray-light); padding: 3px; border-radius: 6px; }
/* token 用量小字(In/Out/缓存命中率),不抢时间戳视觉 */
.msg-actions .act-usage { font-size: 11px; white-space: nowrap; }
.msg-actions .act:active, .msg-actions .act:hover { color: var(--ink); } .msg-actions .act:active, .msg-actions .act:hover { color: var(--ink); }
.msg-actions .act.copied { color: var(--active); } .msg-actions .act.copied { color: var(--active); }
/* 删除本条:悬停变红点明破坏性;禁用态(请求中)半透且不响应 */ /* 删除本条:悬停变红点明破坏性;禁用态(请求中)半透且不响应 */
+19 -5
View File
@@ -545,7 +545,7 @@
return { text: m[2] || '', files: files }; return { text: m[2] || '', files: files };
} }
function actionsHtml(ts, content, msgId) { function actionsHtml(ts, content, msgId, usage) {
const b64 = btoa(unescape(encodeURIComponent(content))); const b64 = btoa(unescape(encodeURIComponent(content)));
// 删除本条:仅已落库消息可删(传 m.id);流式未落库时无 id,不渲染 // 删除本条:仅已落库消息可删(传 m.id);流式未落库时无 id,不渲染
const del = msgId const del = msgId
@@ -553,8 +553,19 @@
'<svg class="ic sm" viewBox="0 0 24 24"><path d="M18 6 6 18"></path><path d="m6 6 12 12"></path></svg>' + '<svg class="ic sm" viewBox="0 0 24 24"><path d="M18 6 6 18"></path><path d="m6 6 12 12"></path></svg>' +
'</button>' '</button>'
: ''; : '';
// token 用量:In 输入(+缓存命中率), Out 输出;历史重渲染时 usage 是 JSON 串,流式事件里是对象
let u = usage;
if (typeof u === 'string') { try { u = JSON.parse(u); } catch (_) { u = null; } }
const usageHtml = u && (u.pt || u.ct)
? '<span class="act-usage" title="输入 ' + (u.pt || 0) + ' tok,缓存命中 ' +
(u.cached == null ? '未上报' : u.cached + ' tok') + ',输出 ' + (u.ct || 0) + ' tok">' +
'In: ' + fmtTok(u.pt || 0) +
(u.cached != null && u.pt ? '/' + Math.round(u.cached / u.pt * 100) + '%' : '') +
', Out: ' + fmtTok(u.ct || 0) + '</span>'
: '';
return '<div class="msg-actions">' + return '<div class="msg-actions">' +
'<span>' + fmtTime(ts) + '</span>' + '<span>' + fmtTime(ts) + '</span>' +
usageHtml +
'<button class="act act-copy" title="复制" data-b64="' + b64 + '">' + '<button class="act act-copy" title="复制" data-b64="' + b64 + '">' +
'<svg class="ic sm" viewBox="0 0 24 24"><rect x="9" y="9" width="13" height="13" rx="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>' + '<svg class="ic sm" viewBox="0 0 24 24"><rect x="9" y="9" width="13" height="13" rx="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg>' +
'</button>' + '</button>' +
@@ -580,7 +591,7 @@
if (!text && !reason) return null; // 纯工具调用的应答:不渲染气泡,工具卡由 appendToolCardsFromAssistant 铺 if (!text && !reason) return null; // 纯工具调用的应答:不渲染气泡,工具卡由 appendToolCardsFromAssistant 铺
const think = reason ? thinkPanelHtml(m.reasoning) : ''; const think = reason ? thinkPanelHtml(m.reasoning) : '';
const bubble = text ? (() => { const r = mdHtml(m.content); return '<div class="bubble-ai' + (r.fmt ? ' md' : '') + '">' + r.html + '</div>'; })() : ''; const bubble = text ? (() => { const r = mdHtml(m.content); return '<div class="bubble-ai' + (r.fmt ? ' md' : '') + '">' + r.html + '</div>'; })() : '';
return '<div class="msg other">' + think + bubble + actionsHtml(m.created_at, m.content || '', m.id) + '</div>'; return '<div class="msg other">' + think + bubble + actionsHtml(m.created_at, m.content || '', m.id, m.usage) + '</div>';
} }
// 思考过程折叠面板:summary 固定名「思考过程」+ 右侧复制按钮,body 展示推理全文。 // 思考过程折叠面板:summary 固定名「思考过程」+ 右侧复制按钮,body 展示推理全文。
// 历史重渲染默认收起(与原设计一致),流式阶段的展开行为由 ensureStreamThinkPanel 显式控制。 // 历史重渲染默认收起(与原设计一致),流式阶段的展开行为由 ensureStreamThinkPanel 显式控制。
@@ -613,7 +624,7 @@
'<details class="msg-summary">' + summaryHeaderHtml() + '<details class="msg-summary">' + summaryHeaderHtml() +
'<div class="msg-summary-body"><div class="bubble-ai' + (r.fmt ? ' md' : '') + '">' + r.html + '</div></div>' + '<div class="msg-summary-body"><div class="bubble-ai' + (r.fmt ? ' md' : '') + '">' + r.html + '</div></div>' +
'</details>' + '</details>' +
actionsHtml(m.created_at, m.content || '', m.id) + actionsHtml(m.created_at, m.content || '', m.id, m.usage) +
'</div>'; '</div>';
} }
@@ -1436,7 +1447,7 @@
const upNames = Array.from($('up-cards').querySelectorAll('.up-card[data-done="1"]')) const upNames = Array.from($('up-cards').querySelectorAll('.up-card[data-done="1"]'))
.map(c => c.dataset.name).filter(Boolean); .map(c => c.dataset.name).filter(Boolean);
const text = upNames.length const text = upNames.length
? '用户上传了文件:' + upNames.join('、') + '\n' + content ? '用户上传了文件:' + upNames.join('、') + '\n\n' + content
: content; : content;
const body = { content: text, deepThink: !!state.deepThink }; const body = { content: text, deepThink: !!state.deepThink };
const sent = await req('POST', '/api/sessions/' + id + '/messages', body); const sent = await req('POST', '/api/sessions/' + id + '/messages', body);
@@ -1588,7 +1599,7 @@
// 补上尾部操作行(时间戳+复制/删除),与历史重渲染(aiMsgHtml)同款; // 补上尾部操作行(时间戳+复制/删除),与历史重渲染(aiMsgHtml)同款;
// created_at 由后端落库时间随事件回传,重进会话后时刻不变 // created_at 由后端落库时间随事件回传,重进会话后时刻不变
if (state.streamWrap) { if (state.streamWrap) {
state.streamWrap.insertAdjacentHTML('beforeend', actionsHtml(d.created_at, d.content || '', d.id)); state.streamWrap.insertAdjacentHTML('beforeend', actionsHtml(d.created_at, d.content || '', d.id, d.usage));
} }
if (d.tool_calls) appendToolCardsFromAssistant(d, $('chat-view')); if (d.tool_calls) appendToolCardsFromAssistant(d, $('chat-view'));
state.streaming = false; state.streaming = false;
@@ -3638,6 +3649,9 @@
'</div>' + '</div>' +
'<div class="cfg-kv"><label>今日 token</label><b title="输入 / 输出">' + (run ? fmtTok(run.today_prompt) + ' / ' + fmtTok(run.today_completion) : '--') + '</b></div>' + '<div class="cfg-kv"><label>今日 token</label><b title="输入 / 输出">' + (run ? fmtTok(run.today_prompt) + ' / ' + fmtTok(run.today_completion) : '--') + '</b></div>' +
'<div class="cfg-kv"><label>累计 token</label><b title="输入 / 输出">' + (run ? fmtTok(run.total_prompt) + ' / ' + fmtTok(run.total_completion) : '--') + '</b></div>' + '<div class="cfg-kv"><label>累计 token</label><b title="输入 / 输出">' + (run ? fmtTok(run.total_prompt) + ' / ' + fmtTok(run.total_completion) : '--') + '</b></div>' +
'<div class="cfg-kv"><label>缓存命中</label><b title="今日缓存 / 累计缓存 tok;历史命中率 = 累计缓存命中 ÷ 累计输入">' +
(run && run.total_prompt ? fmtTok(run.total_cached || 0) + ' · ' + Math.round((run.total_cached || 0) / run.total_prompt * 100) + '%' : '--') +
'</b></div>' +
'</div>'; '</div>';
} }
// 平台卡:头部 = 平台名 + N keys 徒章 + 启用/总数模型数;体内 = 每 Key 一行余额(仅已接入类型)+ 该平台模型列表。 // 平台卡:头部 = 平台名 + N keys 徒章 + 启用/总数模型数;体内 = 每 Key 一行余额(仅已接入类型)+ 该平台模型列表。
+2
View File
@@ -70,8 +70,10 @@ app.get('/api/models', (req, res) => {
const s = stats[r.id] || {}; const s = stats[r.id] || {};
r.today_prompt = s.today_prompt || 0; r.today_prompt = s.today_prompt || 0;
r.today_completion = s.today_completion || 0; r.today_completion = s.today_completion || 0;
r.today_cached = s.today_cached || 0;
r.total_prompt = s.total_prompt || 0; r.total_prompt = s.total_prompt || 0;
r.total_completion = s.total_completion || 0; r.total_completion = s.total_completion || 0;
r.total_cached = s.total_cached || 0;
} }
res.json(rows); res.json(rows);
}); });