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.
JavaScript agent-orchestrationagentic-workflowai-agentsai-codingclaude-codecode-reviewcodebuddycodexcoding-agentscursordeveloper-toolshuman-on-the-loopllmmcpmulti-agentsdlcself-hostedsopworkflow-automationworkflow-engine
【架构优化】合并 repo/analytics.go 中重复的趋势点取用/新建与趋势桶需求登记为 analyticsTrendEntry/addAnalyticsTrendIssue (#772)
fx-kurumi947dfbb2100b
diff --git a/internal/repo/analytics.go b/internal/repo/analytics.goindex 35dd2ad2..e90aa616 100644--- a/internal/repo/analytics.go+++ b/internal/repo/analytics.go@@ -393,11 +393,7 @@ func (r *AnalyticsRepo) analyticsWithRuns(filter domain.AnalyticsFilter, prefetceventAt = eventAt.UTC()day := eventAt.Format("2006-01-02")bucket := analyticsTrendBucket(eventAt, filter.Grain)- point := trends[bucket]- if point == nil {- point = &domain.AnalyticsTrendPoint{Date: bucket}- trends[bucket] = point- }+ point := analyticsTrendEntry(trends, bucket)point.Runs++if !usageCostKnown(run.Usage) {point.CostUnknownRuns++@@ -424,12 +420,7 @@ func (r *AnalyticsRepo) analyticsWithRuns(filter domain.AnalyticsFilter, prefetccell.Runs++cell.Tokens += run.Usage.TotalTokenscell.CostUSD += run.Usage.CostUSD- if issueID != "" {- if trendIssues[bucket] == nil {- trendIssues[bucket] = map[string]struct{}{}- }- trendIssues[bucket][issueID] = struct{}{}- }+ addAnalyticsTrendIssue(trendIssues, bucket, issueID)accumulateUserUsage(users, analyticsRunUserID(run, issuesByID[issueID]), day, run, duration, complete, execDuration)accumulateProjectUsage(projects, domain.RunProjectID(run, issuesByID[issueID].ProjectID), issueID, run)if isExternal {@@ -607,11 +598,7 @@ func (r *AnalyticsRepo) analyticsWithRuns(filter domain.AnalyticsFilter, prefetcout.MRMerges, out.Summary.MergedMRsMissingTime = r.mrMergeAnalytics(filter, issuesByID)out.Summary.MergedMRs = len(out.MRMerges)for _, mr := range out.MRMerges {- bucket := analyticsTrendBucket(mr.MergedAt, filter.Grain)- if trends[bucket] == nil {- trends[bucket] = &domain.AnalyticsTrendPoint{Date: bucket}- }- trends[bucket].MergedMRs+++ analyticsTrendEntry(trends, analyticsTrendBucket(mr.MergedAt, filter.Grain)).MergedMRs++}for _, point := range trends {if ids := trendIssues[point.Date]; ids != nil {@@ -834,6 +821,27 @@ func analyticsTrendBucket(at time.Time, grain string) string {}}+// analyticsTrendEntry 取用 bucket 对应的趋势点,缺失时新建并存回。+func analyticsTrendEntry(trends map[string]*domain.AnalyticsTrendPoint, bucket string) *domain.AnalyticsTrendPoint {+ point := trends[bucket]+ if point == nil {+ point = &domain.AnalyticsTrendPoint{Date: bucket}+ trends[bucket] = point+ }+ return point+}++// addAnalyticsTrendIssue 把需求 ID 记入 bucket 的需求集合;issueID 为空时不登记。+func addAnalyticsTrendIssue(trendIssues map[string]map[string]struct{}, bucket, issueID string) {+ if issueID == "" {+ return+ }+ if trendIssues[bucket] == nil {+ trendIssues[bucket] = map[string]struct{}{}+ }+ trendIssues[bucket][issueID] = struct{}{}+}+// analyticsRunInWindow 保持与既有行为一致:按 Run 创建时间过滤。func analyticsRunInWindow(run domain.Run, filter domain.AnalyticsFilter) bool {if !filter.From.IsZero() && run.CreatedAt.Before(filter.From) {@@ -1432,11 +1440,7 @@ func accumulateConversationRun(summary *domain.AnalyticsSummary, issues map[stri// Same timestamp the analytics window filters on.at := run.CreatedAt.UTC()bucket := analyticsTrendBucket(at, grain)- point := trends[bucket]- if point == nil {- point = &domain.AnalyticsTrendPoint{Date: bucket}- trends[bucket] = point- }+ point := analyticsTrendEntry(trends, bucket)point.Tokens += usage.TotalTokenspoint.CostUSD += usage.CostUSDpoint.ConversationWorkspaces++@@ -1446,12 +1450,7 @@ func accumulateConversationRun(summary *domain.AnalyticsSummary, issues map[stripoint.OutputTokens += usage.OutputTokenspoint.CacheReadTokens += usage.CacheReadTokenspoint.CacheWriteTokens += usage.CacheWriteTokens- if issueID != "" {- if trendIssues[bucket] == nil {- trendIssues[bucket] = map[string]struct{}{}- }- trendIssues[bucket][issueID] = struct{}{}- }+ addAnalyticsTrendIssue(trendIssues, bucket, issueID)if usage.TotalTokens == 0 && usage.CostUSD == 0 && issueID == "" {return}diff --git a/internal/repo/analytics_trend_entry_guard_test.go b/internal/repo/analytics_trend_entry_guard_test.gonew file mode 100644index 00000000..60260c2d--- /dev/null+++ b/internal/repo/analytics_trend_entry_guard_test.go@@ -0,0 +1,62 @@+package repo++import (+ "testing"+ "time"++ "agentflow/internal/domain"+)++// 对话工作区的趋势点与需求集合必须按 grain 分桶,而不是固定按天。+func TestAccumulateConversationRunUsesGrainBucket(t *testing.T) {+ cases := []struct {+ grain string+ bucket string+ }{+ {grain: "month", bucket: "2026-11"},+ {grain: "week", bucket: "2026-W46"},+ {grain: "day", bucket: ""},+ }+ for _, tc := range cases {+ t.Run("grain="+tc.grain, func(t *testing.T) {+ summary := domain.AnalyticsSummary{}+ issues := map[string]struct{}{}+ trends := map[string]*domain.AnalyticsTrendPoint{}+ trendIssues := map[string]map[string]struct{}{}+ users := map[string]*analyticsUserAccumulator{}+ projects := map[string]*analyticsProjectAccumulator{}+ sources := map[string]*analyticsAccumulator{}+ runs := []domain.Run{+ {ID: "conv-1", CreatedAt: time.Date(2026, 11, 10, 3, 0, 0, 0, time.UTC), Usage: domain.TokenUsage{TotalTokens: 100}},+ {ID: "conv-2", CreatedAt: time.Date(2026, 11, 12, 3, 0, 0, 0, time.UTC), Usage: domain.TokenUsage{TotalTokens: 50}},+ }+ for i := range runs {+ runs[i].ExecutionContext.IssueID = "issue-1"+ accumulateConversationRun(&summary, issues, trends, trendIssues, users, projects, sources, runs[i], domain.Issue{ID: "issue-1"}, tc.grain)+ }+ if tc.bucket == "" {+ // 按天粒度:两天各一个点,每个桶各登记一次同一需求。+ if len(trends) != 2 || trends["2026-11-10"] == nil || trends["2026-11-12"] == nil {+ t.Fatalf("day grain trends = %v", trends)+ }+ if len(trendIssues) != 2 || len(trendIssues["2026-11-10"]) != 1 || len(trendIssues["2026-11-12"]) != 1 {+ t.Fatalf("day grain trend issues = %v", trendIssues)+ }+ return+ }+ point := trends[tc.bucket]+ if len(trends) != 1 || point == nil {+ t.Fatalf("expected a single %q trend point, got %v", tc.bucket, trends)+ }+ if point.Date != tc.bucket || point.ConversationWorkspaces != 2 || point.ConversationTokens != 150 || point.Tokens != 150 {+ t.Fatalf("trend point = %+v", point)+ }+ if len(trendIssues) != 1 || len(trendIssues[tc.bucket]) != 1 {+ t.Fatalf("expected issue-1 once under %q, got %v", tc.bucket, trendIssues)+ }+ if _, ok := trendIssues[tc.bucket]["issue-1"]; !ok {+ t.Fatalf("issue-1 missing from %q: %v", tc.bucket, trendIssues)+ }+ })+ }+}diff --git a/internal/repo/analytics_trend_entry_test.go b/internal/repo/analytics_trend_entry_test.gonew file mode 100644index 00000000..6742af3c--- /dev/null+++ b/internal/repo/analytics_trend_entry_test.go@@ -0,0 +1,43 @@+package repo++import (+ "testing"++ "agentflow/internal/domain"+)++func TestAnalyticsTrendEntryReusesBucketAndSetsDate(t *testing.T) {+ trends := map[string]*domain.AnalyticsTrendPoint{}+ first := analyticsTrendEntry(trends, "2026-11-14")+ if first == nil || first.Date != "2026-11-14" {+ t.Fatalf("unexpected new trend point: %+v", first)+ }+ first.Runs+++ if again := analyticsTrendEntry(trends, "2026-11-14"); again != first || again.Runs != 1 {+ t.Fatalf("expected the same trend point for the same bucket, got %+v", again)+ }+ if other := analyticsTrendEntry(trends, "2026-11-15"); other == first || other.Date != "2026-11-15" {+ t.Fatalf("expected a new trend point for another bucket, got %+v", other)+ }+ if len(trends) != 2 {+ t.Fatalf("expected 2 trend points, got %d", len(trends))+ }+}++func TestAddAnalyticsTrendIssueSkipsEmptyAndDeduplicates(t *testing.T) {+ trendIssues := map[string]map[string]struct{}{}+ addAnalyticsTrendIssue(trendIssues, "2026-11", "")+ if len(trendIssues) != 0 {+ t.Fatalf("empty issue ID must not create a bucket set, got %v", trendIssues)+ }+ addAnalyticsTrendIssue(trendIssues, "2026-11", "issue-1")+ addAnalyticsTrendIssue(trendIssues, "2026-11", "issue-1")+ addAnalyticsTrendIssue(trendIssues, "2026-11", "issue-2")+ addAnalyticsTrendIssue(trendIssues, "2026-12", "issue-1")+ if got := len(trendIssues["2026-11"]); got != 2 {+ t.Fatalf("expected 2 distinct issues in 2026-11, got %d", got)+ }+ if got := len(trendIssues["2026-12"]); got != 1 {+ t.Fatalf("expected 1 issue in 2026-12, got %d", got)+ }+}