feat:合并Git提交明细折叠排行到main

Author: JialinLiu-codedance

src-tauri/src/commands.rs

@@ -1411,12 +1411,44 @@ fn git_usage_cache_is_stale(
         return true;
     }
 
+    if !git_usage_cache_has_commit_details(cache) {
+        return true;
+    }
+
     if max_age_minutes <= 0 {
         return true;
     }
     (Utc::now() - cache.generated_at).num_minutes() >= max_age_minutes
 }
 
+fn git_usage_cache_has_commit_details(cache: &git_usage::GitUsageCache) -> bool {
+    [
+        &cache.today,
+        &cache.last3_days,
+        &cache.this_week,
+        &cache.this_month,
+    ]
+    .into_iter()
+    .all(git_usage_report_has_commit_details)
+        && cache
+            .custom_days
+            .iter()
+            .all(git_usage_cached_day_has_commit_details)
+}
+
+fn git_usage_report_has_commit_details(report: &GitUsageReport) -> bool {
+    let has_activity = report.totals.added_lines > 0
+        || report.totals.deleted_lines > 0
+        || report.totals.changed_files > 0;
+    !has_activity || !report.commits.is_empty()
+}
+
+fn git_usage_cached_day_has_commit_details(day: &git_usage::GitUsageCachedDay) -> bool {
+    let has_activity =
+        day.totals.added_lines > 0 || day.totals.deleted_lines > 0 || day.totals.changed_files > 0;
+    !has_activity || !day.commits.is_empty()
+}
+
 fn pr_kpi_cache_is_stale(
     cache: &pr_kpi::PrKpiCache,
     max_age_minutes: i64,
@@ -1870,6 +1902,43 @@ mod tests {
         assert!(!git_usage_cache_is_stale(&cache, 15, "/tmp/old"));
     }
 
+    #[test]
+    fn git_usage_cache_is_stale_when_commit_details_are_missing_from_active_cache() {
+        let now = chrono::Utc::now();
+        let mut cache = git_usage::GitUsageCache {
+            root_path: "/tmp/old".into(),
+            generated_at: now,
+            today: git_usage::empty_report(LocalTokenUsageRange::Today, None),
+            last3_days: git_usage::empty_report(LocalTokenUsageRange::Last3Days, None),
+            this_week: git_usage::empty_report(LocalTokenUsageRange::ThisWeek, None),
+            this_month: git_usage::empty_report(LocalTokenUsageRange::ThisMonth, None),
+            custom_window_start: None,
+            custom_window_end: None,
+            custom_days: vec![],
+        };
+        cache.today.totals.added_lines = 12;
+        cache.today.totals.deleted_lines = 3;
+        cache.today.commits.clear();
+
+        assert!(git_usage_cache_is_stale(&cache, 15, "/tmp/old"));
+
+        cache.today.commits.push(crate::models::GitUsageCommit {
+            commit_hash: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa".into(),
+            short_hash: "aaaaaaaaaa".into(),
+            timestamp: now,
+            author_name: "Test User".into(),
+            author_email: "test@example.com".into(),
+            subject: "test commit".into(),
+            repository_name: "repo".into(),
+            repository_path: "/tmp/repo".into(),
+            added_lines: 12,
+            deleted_lines: 3,
+            changed_files: 1,
+        });
+
+        assert!(!git_usage_cache_is_stale(&cache, 15, "/tmp/old"));
+    }
+
     #[test]
     fn custom_usage_range_request_rejects_invalid_dates() {
         let today = chrono::NaiveDate::from_ymd_opt(2026, 4, 27).unwrap();