diff --git a/app/server/db.js b/app/server/db.js index c21d847..bf8d427 100644 --- a/app/server/db.js +++ b/app/server/db.js @@ -64,8 +64,21 @@ function initDb(dbPath) { value TEXT ); + -- 模型 token 用量流水(每次模型回合一条)。故意不建会话外键: + -- 删会话后累计统计仍需保留 + CREATE TABLE IF NOT EXISTS model_usage ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + session_id TEXT NOT NULL, + model_id TEXT NOT NULL, + prompt_tokens INTEGER DEFAULT 0, + completion_tokens INTEGER DEFAULT 0, + total_tokens INTEGER DEFAULT 0, + created_at INTEGER NOT NULL + ); + CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id, 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); `); // 迁移:旧库补 held_at 列(held 保持租约起始时间) const cols = db.prepare('PRAGMA table_info(sessions)').all(); diff --git a/app/server/engine.js b/app/server/engine.js index 6a786d3..408d62b 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -79,6 +79,41 @@ function saveMessage(sessionId, msg) { return info.lastInsertRowid; } +// 记录一次模型回合的 token 用量(上游未返回 usage 时跳过)。 +// 写入 model_usage 表,不建会话外键:删会话后累计统计仍保留。 +function recordModelUsage(sessionId, modelId, usage) { + if (!modelId || !usage) return; + const pt = usage.prompt_tokens || 0; + const ct = usage.completion_tokens || 0; + const tt = usage.total_tokens || (pt + ct); + if (!pt && !ct && !tt) return; + db.prepare( + 'INSERT INTO model_usage (session_id, model_id, prompt_tokens, completion_tokens, total_tokens, created_at) VALUES (?,?,?,?,?,?)' + ).run(sessionId, modelId, pt, ct, tt, now()); +} + +// 每模型 token 用量统计:今日(本地时区自然日起)+ 累计。 +// 返回 { [model_id]: { today_tokens, total_tokens } },配置内的模型保证有零值占位。 +function modelUsageStats() { + const d = new Date(); + const dayStart = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime(); + const stats = {}; + const slot = function (id) { + if (!stats[id]) stats[id] = { today_tokens: 0, total_tokens: 0 }; + return stats[id]; + }; + for (const m of cfg.models) slot(m.id); + const today = db.prepare( + 'SELECT model_id, SUM(total_tokens) AS n FROM model_usage WHERE created_at >= ? GROUP BY model_id' + ).all(dayStart); + for (const r of today) slot(r.model_id).today_tokens = r.n || 0; + const total = db.prepare( + 'SELECT model_id, SUM(total_tokens) AS n FROM model_usage GROUP BY model_id' + ).all(); + for (const r of total) slot(r.model_id).total_tokens = r.n || 0; + return stats; +} + function emitStatus(sessionId) { const s = getSession(sessionId); if (!s) return; @@ -356,6 +391,7 @@ async function runLoopInner(sessionId, run) { })) : null, }; 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 }); if (!hasTools) { @@ -571,6 +607,8 @@ module.exports = { saveMessage, queuePosition, modelDisplayName, + recordModelUsage, + modelUsageStats, dispatchQueued, TOOL_DEFINITIONS, START_EXECUTION_MESSAGE, diff --git a/app/server/public/css/style.css b/app/server/public/css/style.css index 08adb2c..e91703f 100644 --- a/app/server/public/css/style.css +++ b/app/server/public/css/style.css @@ -67,7 +67,6 @@ body { .badge.completed { background: #eceff5; color: #5c6674; } .badge.held { background: #fff4dc; color: #a06a00; } .badge.cancelled { background: #fdecea; color: #b3382c; } -.session-del { color: #c33; background: none; border: none; font-size: 12px; padding: 6px; } /* ---- 任务搜索 + 归档折叠(2.0) ---- */ .search-bar { display: flex; gap: 8px; align-items: center; padding: 10px 12px 0; } @@ -79,10 +78,12 @@ body { .search-cancel { background: none; border: none; color: #2a5299; font-size: 14px; padding: 6px 4px; cursor: pointer; flex: none; } .search-tip { color: #8891a5; font-size: 12px; padding: 2px 4px 8px; } .load-more { - width: 100%; background: none; border: 1px dashed #ccd2dd; border-radius: 10px; - color: #667; font-size: 13px; padding: 9px; margin-bottom: 10px; cursor: pointer; + display: block; margin: 4px auto 14px; + padding: 8px 26px; background: #fff; color: #2a5299; + border: 1px solid #d5deee; border-radius: 18px; + font-size: 13px; cursor: pointer; box-shadow: 0 1px 3px rgba(30,40,90,0.06); } -.load-more:active { background: #eceef3; } +.load-more:active { background: #eef3fc; } .load-more:disabled { opacity: 0.5; cursor: default; } /* ---- 任务状态栏 ---- */ diff --git a/app/server/public/index.html b/app/server/public/index.html index bb39bc7..3fa78ac 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -284,10 +284,10 @@
- - - - - + + + + +