hanna/fabrica

feat(web): dashboard activity counts all branches

a0a4f0f · hanna committed on 2026-07-25

Add git commits_all_branches (walk every local branch, deduplicated, with the
branch each commit was first found on) and use it for the dashboard heatmap and
feed, so commits made on non-default branches now count and appear with their
actual branch.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Signed by hannaSSH key fingerprint: SHA256:4g9cWhkAAw8gwqhJUcVbSnGEvdGwklW+1Aa/fMUu59k

crates/git/src/repo.rs +48 −0

crates/web/src/activity.rs +4 −5

+        }
+    }
+    /// Recent commits across **all** local branches, deduplicated, each paired
+    /// with the first branch it was found on, for the dashboard activity feed and
+    /// heatmap. `per_branch` bounds the walk per branch. Order is per-branch
+    /// (callers sort by time).
+    ///
+    /// # Errors
+    ///
+    /// Returns [`GitError::Libgit2`] on a revwalk failure.
+    pub fn commits_all_branches(
+        &self,
+        per_branch: usize,
+    ) -> Result<Vec<(CommitSummary, String)>, GitError> {
+        let branches = self.branch_names()?;
+        let mut seen: std::collections::HashSet<String> = std::collections::HashSet::new();
+        let mut out: Vec<(CommitSummary, String)> = Vec::new();
+        for branch in &branches {
+            let Ok(rev) = self.resolve_ref(branch) else {
+                continue;
+            };
+            let start = git2::Oid::from_str(rev.oid.as_str())?;
+            let mut walk = self.inner.revwalk()?;
+            walk.set_sorting(Sort::TIME)?;
+            walk.push(start)?;
+            for oid in walk.take(per_branch) {
+                let oid = oid?;
+                if !seen.insert(oid.to_string()) {
+                    continue;
+                }
+                let commit = self.inner.find_commit(oid)?;
+                out.push((commit_summary(&commit), branch.clone()));
+            }
+        }
+        Ok(out)
+    }
     /// The commits reachable from `head` but not `base`, newest first — the commits
     /// a pull request would contribute. Capped at `limit`.
     ///
+    }
     #[test]
+    fn commits_all_branches_dedupes_and_covers_feature() {
+        let fx = fixture();
+        let repo = open(&fx);
+        let all = repo.commits_all_branches(50).unwrap();
+        // main has 2 commits, feature adds 1 on top; the shared two are counted
+        // once, so three distinct commits total.
+        assert_eq!(all.len(), 3, "deduplicated across branches");
+        // The feature-only commit is present, attributed to `feature`.
+        let feat = all.iter().find(|(c, _)| c.summary == "add extra module");
+        assert_eq!(feat.map(|(_, b)| b.as_str()), Some("feature"));
+    }
+    #[test]
     fn commit_returns_full_detail() {
         let fx = fixture();
         let repo = open(&fx);

     let mut feed: Vec<FeedItem> = Vec::new();
     for repo in &repos {
-        let rev_name = repo.default_branch.clone();
+        // Walk every branch (deduplicated) so work on non-default branches counts.
         let commits = git_read(state, &repo.id, move |r| {
-            let rev = r.resolve_ref(&rev_name)?;
+            r.commits_all_branches(SCAN_PER_REPO)
-            r.commits(&rev, None, git::Page::first(SCAN_PER_REPO))
         })
         .await;
         let Ok(commits) = commits else { continue };
-        for c in commits {
+        for (c, branch) in commits {
             if !c.author.email.eq_ignore_ascii_case(&email) {
                 continue;
+            }
             feed.push(FeedItem {
                 owner: user.username.clone(),
                 repo: repo.path.clone(),
-                branch: repo.default_branch.clone(),
+                branch,
                 short: c.oid.short().to_string(),
                 oid: c.oid.to_string(),
                 summary: c.summary.clone(),