From cbd82386d5189735ff568bc98981d0415876fdd0 Mon Sep 17 00:00:00 2001 From: lzt404 <2596933790@qq.com> Date: Tue, 1 Sep 2026 22:27:44 +0800 Subject: [PATCH] fix(usage): filter control messages and repair unknown records - filter empty, null, refresh, and support_refresh messages before persistence - require request_id for usage records - repair Claude cache token accounting - delete historical unknown records - show deleted record count in usage management --- src-tauri/src/usage.rs | 200 ++++++++++++++++++++++++++++++--- src/i18n/locales/en.ts | 13 ++- src/i18n/locales/zh-CN.ts | 13 ++- src/pages/UsageRecordsPage.tsx | 4 +- 4 files changed, 200 insertions(+), 30 deletions(-) diff --git a/src-tauri/src/usage.rs b/src-tauri/src/usage.rs index 0dc1a5d..b21484b 100644 --- a/src-tauri/src/usage.rs +++ b/src-tauri/src/usage.rs @@ -272,6 +272,7 @@ pub(crate) struct UsageOverview { pub(crate) struct UsageRepairResult { scanned: u64, repaired: u64, + deleted: u64, backup_path: Option, } @@ -553,15 +554,16 @@ fn repair_usage_cache_records_at(root: &Path) -> Result 0 - AND cache_read_tokens + cache_creation_tokens > input_tokens - AND (lower(executor_type) = 'claudeexecutor' - OR lower(provider) = 'claude' - OR lower(provider) LIKE '%anthropic%')"#, + WHERE lower(trim(model)) = 'unknown' + OR (input_tokens > 0 + AND cache_read_tokens + cache_creation_tokens > input_tokens + AND (lower(executor_type) = 'claudeexecutor' + OR lower(provider) = 'claude' + OR lower(provider) LIKE '%anthropic%'))"#, [], |row| row.get(0), ) - .map_err(|error| format!("检查 Claude 使用记录异常行失败: {error}"))?; + .map_err(|error| format!("检查历史使用记录异常行失败: {error}"))?; if candidate_count <= 0 { return Ok(UsageRepairResult::default()); @@ -572,7 +574,7 @@ fn repair_usage_cache_records_at(root: &Path) -> Result Result 0 AND cache_read_tokens + cache_creation_tokens > input_tokens + AND lower(trim(model)) <> 'unknown' AND (lower(executor_type) = 'claudeexecutor' OR lower(provider) = 'claude' OR lower(provider) LIKE '%anthropic%')"#, [], ) .map_err(|error| format!("迁移 Claude 使用记录失败: {error}"))?; + let deleted = transaction + .execute( + "DELETE FROM usage_events WHERE lower(trim(model)) = 'unknown'", + [], + ) + .map_err(|error| format!("删除历史 unknown 记录失败: {error}"))?; transaction .commit() .map_err(|error| format!("提交 Claude 使用记录迁移失败: {error}"))?; Ok(UsageRepairResult { scanned: candidate_count.max(0) as u64, repaired: migrated as u64, + deleted: deleted as u64, backup_path: Some(backup_path), }) } @@ -1608,8 +1618,16 @@ fn publish_collected_records(app: &tauri::AppHandle, saved: usize, message: &str pub(crate) fn persist_local_usage_event( app: &tauri::AppHandle, collector_source: &str, - value: Value, + mut value: Value, ) -> Result { + if let Some(object) = value.as_object_mut() { + if string_field(object, "request_id").is_none() { + object.insert( + "request_id".to_string(), + Value::String(format!("{collector_source}-{}", unique_file_stamp())), + ); + } + } let config = app.state::().snapshot()?; let root = usage_root_dir()?; let saved = persist_queue_items_from_source(&root, collector_source, vec![value], &config)?; @@ -1713,6 +1731,10 @@ fn enqueue_usage_raw_messages( source: &str, messages: Vec, ) -> Result { + let messages = messages + .into_iter() + .filter(|message| !is_ignorable_usage_message(message)) + .collect::>(); if messages.is_empty() { return Ok(0); } @@ -1750,6 +1772,34 @@ fn enqueue_usage_raw_messages( Ok(inserted) } +fn is_ignorable_usage_message(raw: &str) -> bool { + let trimmed = raw.trim(); + if trimmed.is_empty() || trimmed == "null" { + return true; + } + if trimmed.contains("\"request_id\"") { + return false; + } + + let Ok(value) = serde_json::from_str::(trimmed) else { + return false; + }; + let Some(object) = value.as_object() else { + return false; + }; + if object.len() != 1 { + return false; + } + object + .get("refresh") + .and_then(Value::as_bool) + .is_some_and(|enabled| enabled) + || object + .get("support_refresh") + .and_then(Value::as_bool) + .is_some_and(|enabled| enabled) +} + fn persist_raw_usage_message_from_source( root: &Path, source: &str, @@ -2083,7 +2133,8 @@ fn normalize_usage_record(value: Value, config: &GuiConfigFile) -> Result Result Connection { fs::create_dir_all(root).unwrap(); let connection = Connection::open(root.join(USAGE_DATABASE_FILE)).unwrap(); @@ -3913,6 +3997,88 @@ mod tests { assert!(record.tokens.cache_read_tokens <= record.tokens.input_tokens); } + #[test] + fn filters_usage_control_messages_before_inbox() { + assert!(is_ignorable_usage_message("")); + assert!(is_ignorable_usage_message(" null\n")); + assert!(is_ignorable_usage_message(r#"{"refresh":true}"#)); + assert!(is_ignorable_usage_message( + r#"{ "support_refresh" : true }"# + )); + assert!(!is_ignorable_usage_message(r#"{"refresh":false}"#)); + assert!(!is_ignorable_usage_message( + r#"{"refresh":true,"request_id":"usage"}"# + )); + assert!(!is_ignorable_usage_message(r#"{"request_id":"usage"}"#)); + assert!(!is_ignorable_usage_message("not-json")); + + let root = test_root("usage-control-messages"); + initialize_usage_storage_at(&root).unwrap(); + let config = GuiConfigFile::default(); + let inserted = persist_queue_items( + &root, + vec![ + serde_json::json!({"refresh": true}), + serde_json::json!({"support_refresh": true}), + serde_json::json!({ + "request_id": "real-usage", + "provider": "codex", + "model": "gpt-test" + }), + ], + &config, + ) + .unwrap(); + assert_eq!(inserted, 1); + let connection = open_usage_database_at(&root).unwrap(); + let inbox_count = connection + .query_row("SELECT COUNT(*) FROM usage_inbox", [], |row| { + row.get::<_, i64>(0) + }) + .unwrap(); + let event_count = connection + .query_row("SELECT COUNT(*) FROM usage_events", [], |row| { + row.get::<_, i64>(0) + }) + .unwrap(); + assert_eq!(inbox_count, 1); + assert_eq!(event_count, 1); + drop(connection); + fs::remove_dir_all(root).unwrap(); + } + + #[test] + fn rejects_usage_messages_without_request_id() { + let root = test_root("usage-missing-request-id"); + initialize_usage_storage_at(&root).unwrap(); + let mut connection = open_usage_database_at(&root).unwrap(); + enqueue_usage_queue_items( + &mut connection, + "redis_subscribe:usage", + vec![serde_json::json!({ + "provider": "codex", + "model": "gpt-test" + })], + ) + .unwrap(); + let inserted = process_usage_inbox(&mut connection, &GuiConfigFile::default()).unwrap(); + let event_count = connection + .query_row("SELECT COUNT(*) FROM usage_events", [], |row| { + row.get::<_, i64>(0) + }) + .unwrap(); + let status = connection + .query_row("SELECT status FROM usage_inbox", [], |row| { + row.get::<_, String>(0) + }) + .unwrap(); + assert_eq!(inserted, 0); + assert_eq!(event_count, 0); + assert_eq!(status, "decode_failed"); + drop(connection); + fs::remove_dir_all(root).unwrap(); + } + #[test] fn persists_successful_health_checks_and_zero_token_websocket_events() { let root = test_root("queue-events-without-generation"); diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts index aadd0f7..7cd0867 100644 --- a/src/i18n/locales/en.ts +++ b/src/i18n/locales/en.ts @@ -248,18 +248,19 @@ export const en: Record = { 'usage.pricing.deleted': 'Model price deleted; overview cost updated', 'usage.pricing.deleteConfirm': 'Delete the price for {model}?', 'usage.dataManagement.title': 'Historical Data Management', - 'usage.dataManagement.description': 'Scan and repair historical usage records with inconsistent cache token accounting.', + 'usage.dataManagement.description': 'Scan and repair known anomalies in historical usage records.', 'usage.dataManagement.manualBadge': 'Manual action', - 'usage.dataManagement.notice': 'A database backup is created first. Only identifiable Claude / Anthropic records are processed.', - 'usage.dataManagement.actionTitle': 'Repair cache records', - 'usage.dataManagement.actionDescription': 'Use input token accounting that includes cache reads and cache creation.', + 'usage.dataManagement.notice': 'A database backup is created first. Only cache anomalies and unknown records are processed.', + 'usage.dataManagement.actionTitle': 'Repair historical anomalies', + 'usage.dataManagement.actionDescription': 'Correct Claude cache token accounting and delete records recorded as unknown usage.', 'usage.dataManagement.run': 'Scan and repair', 'usage.dataManagement.running': 'Processing…', - 'usage.dataManagement.confirm': 'Scan and repair historical cache records? A database backup will be created first.', + 'usage.dataManagement.confirm': 'Scan and repair historical anomalous records? A database backup will be created first.', 'usage.dataManagement.scanned': 'Scanned', 'usage.dataManagement.repaired': 'Repaired', + 'usage.dataManagement.deleted': 'Invalid records deleted', 'usage.dataManagement.backup': 'Backup file', - 'usage.dataManagement.success': 'Historical cache data processing completed. {repaired} records repaired.', + 'usage.dataManagement.success': 'Historical data processed: {repaired} repaired and {deleted} invalid records deleted.', 'usage.trend.title': 'Request and Token Trend', 'usage.trend.description': 'Grouped by local system hour', 'usage.token.title': 'Token Breakdown', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index f223099..5211b44 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -246,18 +246,19 @@ export const zhCN = { 'usage.pricing.deleted': '模型价格已删除，总览成本已更新', 'usage.pricing.deleteConfirm': '确定删除模型 {model} 的价格吗？', 'usage.dataManagement.title': '历史数据管理', - 'usage.dataManagement.description': '扫描并修复缓存 Token 口径异常的历史使用记录。', + 'usage.dataManagement.description': '扫描并修复历史使用记录中的已知数据异常。', 'usage.dataManagement.manualBadge': '手动操作', - 'usage.dataManagement.notice': '修复前会自动备份数据库，仅处理可确认的 Claude / Anthropic 异常记录。', - 'usage.dataManagement.actionTitle': '修复异常缓存记录', - 'usage.dataManagement.actionDescription': '将输入 Token 统一为包含缓存读取和缓存创建的统计口径。', + 'usage.dataManagement.notice': '修复前会自动备份数据库，仅处理缓存口径异常和 unknown 记录。', + 'usage.dataManagement.actionTitle': '修复历史异常记录', + 'usage.dataManagement.actionDescription': '修正错误缓存信息，并删除被误记为 unknown 的记录。', 'usage.dataManagement.run': '扫描并修复', 'usage.dataManagement.running': '处理中…', - 'usage.dataManagement.confirm': '确定扫描并修复历史缓存记录吗？修复前会自动创建数据库备份。', + 'usage.dataManagement.confirm': '确定扫描并修复历史异常记录吗？修复前会自动创建数据库备份。', 'usage.dataManagement.scanned': '扫描记录', 'usage.dataManagement.repaired': '修复记录', + 'usage.dataManagement.deleted': '删除误记录', 'usage.dataManagement.backup': '备份文件', - 'usage.dataManagement.success': '历史缓存数据处理完成，已修复 {repaired} 条记录。', + 'usage.dataManagement.success': '历史数据处理完成：修复 {repaired} 条，删除 {deleted} 条误记录。', 'usage.trend.title': '请求与 Token 趋势', 'usage.trend.description': '按系统本地小时聚合', 'usage.token.title': 'Token 构成', diff --git a/src/pages/UsageRecordsPage.tsx b/src/pages/UsageRecordsPage.tsx index a6b8fa7..fe2aa0a 100644 --- a/src/pages/UsageRecordsPage.tsx +++ b/src/pages/UsageRecordsPage.tsx @@ -163,6 +163,7 @@ type UsagePricing = { type UsageRepairResult = { scanned: number; repaired: number; + deleted: number; backupPath: string | null; }; @@ -759,11 +760,12 @@ function UsageDataManagementView() { <>
{t('usage.dataManagement.scanned')}{result.scanned.toLocaleString()}
{t('usage.dataManagement.repaired')}{result.repaired.toLocaleString()}
+
{t('usage.dataManagement.deleted')}{result.deleted.toLocaleString()}
{t('usage.dataManagement.backup')}{result.backupPath ?? '—'}