diff --git a/src/main/db/sqlite.ts b/src/main/db/sqlite.ts index 004607d..a631d8c 100644 --- a/src/main/db/sqlite.ts +++ b/src/main/db/sqlite.ts @@ -143,6 +143,7 @@ export async function initDatabase(): Promise { tool_calls TEXT, tool_name TEXT, eval_count INTEGER, + prompt_eval_count INTEGER, total_duration INTEGER, created_at INTEGER NOT NULL, FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE @@ -221,6 +222,9 @@ export async function initDatabase(): Promise { CREATE INDEX IF NOT EXISTS idx_skills_updated ON skills(updated_at DESC); `); + // 兼容迁移：为已有 messages 表补充 prompt_eval_count 列（新库已有，旧库需要 ALTER） + try { db.run('ALTER TABLE messages ADD COLUMN prompt_eval_count INTEGER'); } catch { /* 列已存在，忽略 */ } + // 尝试创建 FTS5 全文搜索（可选，sql.js 默认 WASM 可能不包含 FTS5） try { db.run(` @@ -265,6 +269,7 @@ export interface MessageRow { tool_calls: string | null; tool_name: string | null; eval_count: number | null; + prompt_eval_count: number | null; total_duration: number | null; created_at: number; } @@ -364,10 +369,10 @@ export function clearAllSessions(): void { export function saveMessage(msg: MessageRow): string { const d = getDb(); - runExec(d, `INSERT OR REPLACE INTO messages (id, session_id, role, content, thinking, images, tool_calls, tool_name, eval_count, total_duration, created_at) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, + runExec(d, `INSERT OR REPLACE INTO messages (id, session_id, role, content, thinking, images, tool_calls, tool_name, eval_count, prompt_eval_count, total_duration, created_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [msg.id, msg.session_id, msg.role, msg.content, msg.thinking, msg.images, - msg.tool_calls, msg.tool_name, msg.eval_count, msg.total_duration, msg.created_at] + msg.tool_calls, msg.tool_name, msg.eval_count, msg.prompt_eval_count, msg.total_duration, msg.created_at] ); persist(); return msg.id; diff --git a/src/renderer/components/input-area.ts b/src/renderer/components/input-area.ts index 2957d6d..17f47b8 100644 --- a/src/renderer/components/input-area.ts +++ b/src/renderer/components/input-area.ts @@ -349,6 +349,7 @@ async function handleRetry(): Promise { ...(retryThinkContent && { think: retryThinkContent }), ...(toolRecords?.length && { toolCalls: toolRecords }), ...(loopStats?.eval_count && { eval_count: loopStats.eval_count }), + ...(loopStats?.prompt_eval_count && { prompt_eval_count: loopStats.prompt_eval_count }), ...(loopStats?.total_duration && { total_duration: loopStats.total_duration }), }; state.update(KEYS.CURRENT_SESSION, (s: ChatSession | null) => ({ @@ -362,6 +363,7 @@ async function handleRetry(): Promise { ...(retryThinkContent && { think: retryThinkContent }), ...(toolRecords?.length && { toolCalls: toolRecords }), ...(loopStats?.eval_count && { eval_count: loopStats.eval_count }), + ...(loopStats?.prompt_eval_count && { prompt_eval_count: loopStats.prompt_eval_count }), ...(loopStats?.total_duration && { total_duration: loopStats.total_duration }), }; state.update(KEYS.CURRENT_SESSION, (s: ChatSession | null) => ({ @@ -1056,7 +1058,8 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio ...(thinkContent && { think: thinkContent }), ...(toolRecords?.length && { toolCalls: toolRecords }), ...(loopStats?.eval_count && { eval_count: loopStats.eval_count }), - ...(lastIterDuration > 0 && { total_duration: lastIterDuration }), + ...(loopStats?.prompt_eval_count && { prompt_eval_count: loopStats.prompt_eval_count }), + ...(loopStats?.total_duration && { total_duration: loopStats.total_duration }), }; state.update(KEYS.CURRENT_SESSION, (session: ChatSession | null) => ({ ...session, @@ -1064,14 +1067,7 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio updatedAt: Date.now() })); } - const perIterStats = { - eval_count: loopStats?.eval_count, - total_duration: (() => { - const dur = (Date.now() - lastIterationStartTime) * 1e6; - return dur > 0 ? dur : undefined; - })(), - }; - updateLastAssistantMessage(assistantContent, thinkContent || null, perIterStats); + updateLastAssistantMessage(assistantContent, thinkContent || null, loopStats || null); } else { // 单迭代模式：正常保存 const assistantMsg: ChatMessage = { @@ -1081,6 +1077,7 @@ async function sendMessageWithAgentLoop(text: string, currentSession: ChatSessio ...(thinkContent && { think: thinkContent }), ...(toolRecords?.length && { toolCalls: toolRecords }), ...(loopStats?.eval_count && { eval_count: loopStats.eval_count }), + ...(loopStats?.prompt_eval_count && { prompt_eval_count: loopStats.prompt_eval_count }), ...(loopStats?.total_duration && { total_duration: loopStats.total_duration }), }; state.update(KEYS.CURRENT_SESSION, (session: ChatSession | null) => ({ diff --git a/src/renderer/components/token-dashboard.ts b/src/renderer/components/token-dashboard.ts index 6f30aad..ad14853 100644 --- a/src/renderer/components/token-dashboard.ts +++ b/src/renderer/components/token-dashboard.ts @@ -52,6 +52,7 @@ interface RoundData { round: number; role: string; eval_count: number; + prompt_eval_count: number; total_duration: number; timestamp: number; model?: string; @@ -61,12 +62,13 @@ function collectRoundData(messages: ChatMessage[]): RoundData[] { const rounds: RoundData[] = []; let roundNum = 0; for (const msg of messages) { - if (msg.role === 'assistant' && (msg.eval_count || msg.total_duration)) { + if (msg.role === 'assistant' && (msg.eval_count || msg.prompt_eval_count || msg.total_duration)) { roundNum++; rounds.push({ round: roundNum, role: msg.role, eval_count: msg.eval_count || 0, + prompt_eval_count: msg.prompt_eval_count || 0, total_duration: msg.total_duration || 0, timestamp: msg.timestamp, model: msg.model, @@ -101,7 +103,9 @@ function renderDashboard(): void { const aiMsgs = messages.filter(m => m.role === 'assistant'); const rounds = collectRoundData(messages); - const totalTokens = rounds.reduce((sum, r) => sum + r.eval_count, 0); + const totalOutputTokens = rounds.reduce((sum, r) => sum + r.eval_count, 0); + const totalInputTokens = rounds.reduce((sum, r) => sum + r.prompt_eval_count, 0); + const totalTokens = totalInputTokens + totalOutputTokens; const totalDurationNs = rounds.reduce((sum, r) => sum + r.total_duration, 0); const avgTokens = rounds.length > 0 ? Math.round(totalTokens / rounds.length) : 0; @@ -112,6 +116,7 @@ function renderDashboard(): void {
🔥
${formatTokenCount(totalTokens)}
总 Token 消耗
+
输入 ${formatTokenCount(totalInputTokens)} / 输出 ${formatTokenCount(totalOutputTokens)}
💬
@@ -135,15 +140,19 @@ function renderDashboard(): void { if (rounds.length === 0) { chartEl.innerHTML = '
暂无数据，发送消息后开始统计
'; } else { - const maxTokens = Math.max(...rounds.map(r => r.eval_count), 1); + const maxTokens = Math.max(...rounds.map(r => r.eval_count + r.prompt_eval_count), 1); const barsHtml = rounds.map(r => { - const heightPct = Math.max((r.eval_count / maxTokens) * 100, 2); - const tooltip = `第${r.round}轮 · ${formatTokenCount(r.eval_count)} tokens · ${formatDuration(r.total_duration)}`; + const total = r.eval_count + r.prompt_eval_count; + const heightPct = Math.max((total / maxTokens) * 100, 2); + const inputPct = total > 0 ? (r.prompt_eval_count / total) * 100 : 0; + const tooltip = `第${r.round}轮 · 输入 ${formatTokenCount(r.prompt_eval_count)} + 输出 ${formatTokenCount(r.eval_count)} = ${formatTokenCount(total)} tokens · ${formatDuration(r.total_duration)}`; return `
-
${formatTokenCount(r.eval_count)}
+
${formatTokenCount(total)}
-
+
+
+
R${r.round}
@@ -151,6 +160,10 @@ function renderDashboard(): void { }).join(''); chartEl.innerHTML = ` +
+ 输出 Token + 输入 Token +
${formatTokenCount(maxTokens)} @@ -165,18 +178,23 @@ function renderDashboard(): void { // C. 明细表格 const tableEl = dashboardModalEl.querySelector('#tdTableBody')!; if (rounds.length === 0) { - tableEl.innerHTML = '暂无数据'; + tableEl.innerHTML = '暂无数据'; } else { // 按时间倒序 const sorted = [...rounds].reverse(); - tableEl.innerHTML = sorted.map(r => ` + tableEl.innerHTML = sorted.map(r => { + const total = r.eval_count + r.prompt_eval_count; + return ` R${r.round} 🤖 AI${r.model ? ` ${r.model}` : ''} + ${formatTokenCount(r.prompt_eval_count)} ${formatTokenCount(r.eval_count)} + ${formatTokenCount(total)} ${formatDuration(r.total_duration)} ${r.timestamp ? formatTime(r.timestamp) : '-'} - `).join(''); + `; + }).join(''); } } diff --git a/src/renderer/db/chat-db.ts b/src/renderer/db/chat-db.ts index 70ecdc0..5bf303d 100644 --- a/src/renderer/db/chat-db.ts +++ b/src/renderer/db/chat-db.ts @@ -90,6 +90,7 @@ export class ChatDB { tool_calls: msg.toolCalls?.length ? JSON.stringify(msg.toolCalls) : null, tool_name: null, eval_count: msg.eval_count || null, + prompt_eval_count: msg.prompt_eval_count || null, total_duration: msg.total_duration || null, created_at: msg.timestamp }; @@ -112,6 +113,7 @@ export class ChatDB { think: r.thinking || undefined, images: r.images ? JSON.parse(r.images) : undefined, eval_count: r.eval_count || undefined, + prompt_eval_count: r.prompt_eval_count || undefined, total_duration: r.total_duration || undefined, toolCalls: r.tool_calls ? JSON.parse(r.tool_calls) : undefined })); @@ -170,6 +172,7 @@ export class ChatDB { images: m.images?.length ? JSON.stringify(m.images) : null, tool_calls: m.toolCalls?.length ? JSON.stringify(m.toolCalls) : null, tool_name: null, eval_count: m.eval_count || null, + prompt_eval_count: m.prompt_eval_count || null, total_duration: m.total_duration || null, created_at: m.timestamp }))), memories: [], diff --git a/src/renderer/index.html b/src/renderer/index.html index be15d3c..934415f 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -668,7 +668,9 @@ 轮次 角色 - Token 数 + 输入 + 输出 + 合计 耗时 时间 diff --git a/src/renderer/services/agent-engine.ts b/src/renderer/services/agent-engine.ts index 6e2066f..ca62521 100644 --- a/src/renderer/services/agent-engine.ts +++ b/src/renderer/services/agent-engine.ts @@ -356,7 +356,7 @@ export interface AgentCallbacks { onToolCallStart: (call: ToolCall) => void; onToolCallResult: (name: string, result: ToolResult, call: ToolCall) => void; onToolCallError: (name: string, error: string, call: ToolCall) => void; - onDone: (finalContent: string, toolRecords?: ToolCallRecord[], stats?: { eval_count?: number; total_duration?: number }) => void; + onDone: (finalContent: string, toolRecords?: ToolCallRecord[], stats?: { eval_count?: number; prompt_eval_count?: number; total_duration?: number }) => void; onConfirmTool: (call: ToolCall) => Promise; /** Agent Loop 新迭代开始（前一轮工具执行完毕，下一轮流式输出即将开始） */ onNewIteration?: (toolCalls?: ToolCall[]) => void; @@ -510,16 +510,24 @@ export async function runAgentLoop( const allToolRecords: ToolCallRecord[] = []; const loopStartTime = Date.now(); let content = ''; + /** 每轮累计 token 统计 */ let totalEvalCount = 0; + let totalPromptEvalCount = 0; + let totalInferenceNs = 0; + /** 当前轮的 Ollama 统计（流式最后一个 chunk 赋值） */ + let loopEvalCount = 0; + let loopPromptEvalCount = 0; + let loopInferenceNs = 0; /** 跨轮去重：仅跟踪成功的工具调用（失败的允许重试） */ let prevLoopSuccessKeys: string[] = []; /** 保存上一轮的工具调用，供 onNewIteration 使用 */ let prevToolCalls: ToolCall[] = []; - const makeStats = () => { - const totalDuration = (Date.now() - loopStartTime) * 1e6; - return { eval_count: totalEvalCount || undefined, total_duration: totalDuration }; - }; + const makeStats = () => ({ + eval_count: totalEvalCount || undefined, + prompt_eval_count: totalPromptEvalCount || undefined, + total_duration: totalInferenceNs || undefined, + }); while (loopCount < maxLoops) { loopCount++; @@ -581,7 +589,9 @@ export async function runAgentLoop( content += chunk.message.content; callbacks.onContent(content); } - if (chunk.eval_count) { totalEvalCount = chunk.eval_count; state.set('_currentEvalCount', totalEvalCount); } + if (chunk.eval_count) { loopEvalCount = chunk.eval_count; } + if (chunk.prompt_eval_count) { loopPromptEvalCount = chunk.prompt_eval_count; } + if (chunk.total_duration) { loopInferenceNs = chunk.total_duration; } if (chunk.message?.tool_calls?.length) { for (const tc of chunk.message.tool_calls) { if (tc.function?.name) { @@ -603,6 +613,16 @@ export async function runAgentLoop( }, abortController ); + + // 本轮流式结束，累加 token 统计 + totalEvalCount += loopEvalCount; + totalPromptEvalCount += loopPromptEvalCount; + totalInferenceNs += loopInferenceNs; + state.set('_currentEvalCount', totalEvalCount); + // 重置本轮计数器（下一轮重新从 chunk 收集） + loopEvalCount = 0; + loopPromptEvalCount = 0; + loopInferenceNs = 0; } catch (err) { if (abortController.signal.aborted) { logInfo('流式调用已中止'); diff --git a/src/renderer/styles/style.css b/src/renderer/styles/style.css index 2a8dec7..1779fa9 100644 --- a/src/renderer/styles/style.css +++ b/src/renderer/styles/style.css @@ -3516,6 +3516,13 @@ html, body { font-weight: 500; } +.td-stat-detail { + font-size: 10px; + color: var(--text-tertiary); + margin-top: 2px; + font-family: var(--font-mono); +} + /* 区块标题 */ .td-section { margin-bottom: 20px; @@ -3601,6 +3608,43 @@ html, body { background: linear-gradient(180deg, #E8734A 0%, #F0976E 100%); border-radius: 4px 4px 0 0; transition: height 0.3s ease; + display: flex; + flex-direction: column-reverse; +} + +.td-bar-input { + width: 100%; + background: linear-gradient(180deg, #9B7ED8 0%, #B99BE5 100%); + border-radius: 4px 4px 0 0; + min-height: 0; +} + +.td-chart-legend { + display: flex; + gap: 16px; + margin-bottom: 10px; + font-size: 11px; + color: var(--text-secondary); +} + +.td-legend-item { + display: flex; + align-items: center; + gap: 4px; +} + +.td-legend-dot { + width: 10px; + height: 10px; + border-radius: 2px; +} + +.td-legend-output { + background: #E8734A; +} + +.td-legend-input { + background: #9B7ED8; } .td-bar-label { @@ -3676,6 +3720,11 @@ html, body { text-align: right; } +.td-num-total { + font-weight: 700; + color: var(--accent); +} + .td-time { font-size: 11px; color: var(--text-secondary); diff --git a/src/renderer/types.d.ts b/src/renderer/types.d.ts index f1d7e73..2981f2a 100644 --- a/src/renderer/types.d.ts +++ b/src/renderer/types.d.ts @@ -36,6 +36,7 @@ export interface OllamaStreamChunk { }; done?: boolean; eval_count?: number; + prompt_eval_count?: number; total_duration?: number; } @@ -99,6 +100,7 @@ export interface ChatMessage { model?: string; think?: string; eval_count?: number; + prompt_eval_count?: number; total_duration?: number; images?: string[]; files?: ChatFile[];