Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

refactor(repo): 合并 analytics 中重复的累加器取用或新建逻辑 (#473) (#474)

fx-kurumi691b5c41b806
diff --git a/internal/repo/analytics.go b/internal/repo/analytics.go
index 098a2a74..06f2c00a 100644
--- a/internal/repo/analytics.go
+++ b/internal/repo/analytics.go
@@ -1127,8 +1127,8 @@ func accumulateVersion(values map[string]*analyticsVersionAccumulator, workflowI
}
}
-// accumulateUserUsage 按"责任人 × 自然日"聚合用量。
-func accumulateUserUsage(values map[string]*analyticsUserAccumulator, userID, day string, run domain.Run, duration int64, complete bool, execDuration int64) {
+// analyticsUserEntry 返回"责任人 × 自然日"的累加器,不存在时新建;空责任人归为 unassigned。
+func analyticsUserEntry(values map[string]*analyticsUserAccumulator, userID, day string) *analyticsUserAccumulator {
if userID == "" {
userID = "unassigned"
}
@@ -1138,6 +1138,12 @@ func accumulateUserUsage(values map[string]*analyticsUserAccumulator, userID, da
value = &analyticsUserAccumulator{item: domain.AnalyticsUserUsage{UserID: userID, Date: day, CostKnown: true}}
values[key] = value
}
+ return value
+}
+
+// accumulateUserUsage 按"责任人 × 自然日"聚合用量。
+func accumulateUserUsage(values map[string]*analyticsUserAccumulator, userID, day string, run domain.Run, duration int64, complete bool, execDuration int64) {
+ value := analyticsUserEntry(values, userID, day)
value.item.Runs++
value.item.Tokens += run.Usage.TotalTokens
value.item.InputTokens += run.Usage.InputTokens
@@ -1251,7 +1257,8 @@ func finalizeUserUsage(values map[string]*analyticsUserAccumulator) []domain.Ana
return out
}
-func accumulateProjectUsage(values map[string]*analyticsProjectAccumulator, projectID, issueID string, run domain.Run) {
+// analyticsProjectEntry 返回项目的累加器,不存在时新建;空项目归为 unassigned。
+func analyticsProjectEntry(values map[string]*analyticsProjectAccumulator, projectID string) *analyticsProjectAccumulator {
if projectID == "" {
projectID = "unassigned"
}
@@ -1260,6 +1267,11 @@ func accumulateProjectUsage(values map[string]*analyticsProjectAccumulator, proj
value = &analyticsProjectAccumulator{item: domain.AnalyticsProjectUsage{ProjectID: projectID, CostKnown: true}, issues: map[string]struct{}{}}
values[projectID] = value
}
+ return value
+}
+
+func accumulateProjectUsage(values map[string]*analyticsProjectAccumulator, projectID, issueID string, run domain.Run) {
+ value := analyticsProjectEntry(values, projectID)
value.item.Runs++
value.item.Tokens += run.Usage.TotalTokens
value.item.CostUSD += run.Usage.CostUSD
@@ -1313,8 +1325,8 @@ func analyticsIssueSource(issue domain.Issue) string {
return source
}
-// accumulateIssueSource 按需求来源聚合执行量、Token、成本与执行耗时。
-func accumulateIssueSource(values map[string]*analyticsAccumulator, source string, run domain.Run, execDuration int64) {
+// analyticsSourceEntry 返回需求来源的累加器,不存在时新建;空来源归为 local。
+func analyticsSourceEntry(values map[string]*analyticsAccumulator, source string) *analyticsAccumulator {
if source == "" {
source = "local"
}
@@ -1323,6 +1335,12 @@ func accumulateIssueSource(values map[string]*analyticsAccumulator, source strin
value = &analyticsAccumulator{item: domain.AnalyticsBreakdown{Key: source, Name: source}}
values[source] = value
}
+ return value
+}
+
+// accumulateIssueSource 按需求来源聚合执行量、Token、成本与执行耗时。
+func accumulateIssueSource(values map[string]*analyticsAccumulator, source string, run domain.Run, execDuration int64) {
+ value := analyticsSourceEntry(values, source)
value.item.Runs++
value.item.Tokens += run.Usage.TotalTokens
value.item.CostUSD += run.Usage.CostUSD
@@ -1439,43 +1457,21 @@ func accumulateConversationRun(summary *domain.AnalyticsSummary, issues map[stri
if usage.TotalTokens == 0 && usage.CostUSD == 0 && issueID == "" {
return
}
- userID := analyticsRunUserID(run, issue)
- if userID == "" {
- userID = "unassigned"
- }
- key := userID + "\x00" + at.Format("2006-01-02")
- user := users[key]
- if user == nil {
- user = &analyticsUserAccumulator{item: domain.AnalyticsUserUsage{UserID: userID, Date: at.Format("2006-01-02"), CostKnown: true}}
- users[key] = user
- }
+ user := analyticsUserEntry(users, analyticsRunUserID(run, issue), at.Format("2006-01-02"))
user.item.Tokens += usage.TotalTokens
user.item.InputTokens += usage.InputTokens
user.item.OutputTokens += usage.OutputTokens
user.item.CacheReadTokens += usage.CacheReadTokens
user.item.CacheWriteTokens += usage.CacheWriteTokens
user.item.CostUSD += usage.CostUSD
- projectID := domain.RunProjectID(run, issue.ProjectID)
- if projectID == "" {
- projectID = "unassigned"
- }
- project := projects[projectID]
- if project == nil {
- project = &analyticsProjectAccumulator{item: domain.AnalyticsProjectUsage{ProjectID: projectID, CostKnown: true}, issues: map[string]struct{}{}}
- projects[projectID] = project
- }
+ project := analyticsProjectEntry(projects, domain.RunProjectID(run, issue.ProjectID))
project.item.Tokens += usage.TotalTokens
project.item.CostUSD += usage.CostUSD
if issueID == "" {
return
}
project.issues[issueID] = struct{}{}
- source := analyticsIssueSource(issue)
- value := sources[source]
- if value == nil {
- value = &analyticsAccumulator{item: domain.AnalyticsBreakdown{Key: source, Name: source}}
- sources[source] = value
- }
+ value := analyticsSourceEntry(sources, analyticsIssueSource(issue))
value.item.Tokens += usage.TotalTokens
value.item.CostUSD += usage.CostUSD
value.inputTokens += usage.InputTokens
diff --git a/internal/repo/analytics_accumulator_entry_test.go b/internal/repo/analytics_accumulator_entry_test.go
new file mode 100644
index 00000000..2024b853
--- /dev/null
+++ b/internal/repo/analytics_accumulator_entry_test.go
@@ -0,0 +1,48 @@
+package repo
+
+import "testing"
+
+func TestAnalyticsUserEntryReusesAndDefaultsUnassigned(t *testing.T) {
+ values := map[string]*analyticsUserAccumulator{}
+ first := analyticsUserEntry(values, "", "2026-11-13")
+ if first.item.UserID != "unassigned" || first.item.Date != "2026-11-13" || !first.item.CostKnown {
+ t.Fatalf("unexpected new user entry: %+v", first.item)
+ }
+ if again := analyticsUserEntry(values, "unassigned", "2026-11-13"); again != first {
+ t.Fatalf("expected the same accumulator for the same user and day")
+ }
+ if other := analyticsUserEntry(values, "unassigned", "2026-11-14"); other == first {
+ t.Fatalf("expected a new accumulator for another day")
+ }
+ if len(values) != 2 {
+ t.Fatalf("expected 2 entries, got %d", len(values))
+ }
+}
+
+func TestAnalyticsProjectEntryReusesAndDefaultsUnassigned(t *testing.T) {
+ values := map[string]*analyticsProjectAccumulator{}
+ first := analyticsProjectEntry(values, "")
+ if first.item.ProjectID != "unassigned" || !first.item.CostKnown || first.issues == nil {
+ t.Fatalf("unexpected new project entry: %+v", first)
+ }
+ if again := analyticsProjectEntry(values, "unassigned"); again != first {
+ t.Fatalf("expected the same accumulator for the same project")
+ }
+ if analyticsProjectEntry(values, "p1") == first || len(values) != 2 {
+ t.Fatalf("expected a separate accumulator per project, got %d entries", len(values))
+ }
+}
+
+func TestAnalyticsSourceEntryReusesAndDefaultsLocal(t *testing.T) {
+ values := map[string]*analyticsAccumulator{}
+ first := analyticsSourceEntry(values, "")
+ if first.item.Key != "local" || first.item.Name != "local" {
+ t.Fatalf("unexpected new source entry: %+v", first.item)
+ }
+ if again := analyticsSourceEntry(values, "local"); again != first {
+ t.Fatalf("expected the same accumulator for the same source")
+ }
+ if analyticsSourceEntry(values, "tapd") == first || len(values) != 2 {
+ t.Fatalf("expected a separate accumulator per source, got %d entries", len(values))
+ }
+}