Fix weekly runs showing total: include weekly_runs in data

Author: jahooma

web/src/app/api/agents/route.ts

@@ -63,6 +63,7 @@ const getCachedAgents = unstable_cache(
       .select({
         publisher_id: schema.agentRun.publisher_id,
         agent_name: schema.agentRun.agent_name,
+        weekly_runs: sql<number>`COUNT(*)`,
         weekly_dollars: sql<number>`COALESCE(SUM(${schema.agentRun.total_credits}) / 100.0, 0)`,
       })
       .from(schema.agentRun)
@@ -111,6 +112,7 @@ const getCachedAgents = unstable_cache(
         publisher_id: schema.agentRun.publisher_id,
         agent_name: schema.agentRun.agent_name,
         agent_version: schema.agentRun.agent_version,
+        weekly_runs: sql<number>`COUNT(*)`,
         weekly_dollars: sql<number>`COALESCE(SUM(${schema.agentRun.total_credits}) / 100.0, 0)`,
       })
       .from(schema.agentRun)
@@ -135,7 +137,10 @@ const getCachedAgents = unstable_cache(
     weeklyMetrics.forEach((metric) => {
       if (metric.publisher_id && metric.agent_name) {
         const key = `${metric.publisher_id}/${metric.agent_name}`
-        weeklyMap.set(key, Number(metric.weekly_dollars))
+        weeklyMap.set(key, {
+          weekly_runs: Number(metric.weekly_runs),
+          weekly_dollars: Number(metric.weekly_dollars),
+        })
       }
     })
 
@@ -144,8 +149,13 @@ const getCachedAgents = unstable_cache(
     usageMetrics.forEach((metric) => {
       if (metric.publisher_id && metric.agent_name) {
         const key = `${metric.publisher_id}/${metric.agent_name}`
+        const weeklyData = weeklyMap.get(key) || {
+          weekly_runs: 0,
+          weekly_dollars: 0,
+        }
         metricsMap.set(key, {
-          weekly_dollars: weeklyMap.get(key) || 0,
+          weekly_runs: weeklyData.weekly_runs,
+          weekly_dollars: weeklyData.weekly_dollars,
           total_dollars: Number(metric.total_dollars),
           total_invocations: Number(metric.total_invocations),
           avg_cost_per_run: Number(metric.avg_cost_per_run),
@@ -160,7 +170,10 @@ const getCachedAgents = unstable_cache(
     perVersionWeeklyMetrics.forEach((metric) => {
       if (metric.publisher_id && metric.agent_name && metric.agent_version) {
         const key = `${metric.publisher_id}/${metric.agent_name}@${metric.agent_version}`
-        perVersionWeeklyMap.set(key, Number(metric.weekly_dollars))
+        perVersionWeeklyMap.set(key, {
+          weekly_runs: Number(metric.weekly_runs),
+          weekly_dollars: Number(metric.weekly_dollars),
+        })
       }
     })
 
@@ -169,8 +182,13 @@ const getCachedAgents = unstable_cache(
     perVersionMetrics.forEach((metric) => {
       if (metric.publisher_id && metric.agent_name && metric.agent_version) {
         const key = `${metric.publisher_id}/${metric.agent_name}@${metric.agent_version}`
+        const weeklyData = perVersionWeeklyMap.get(key) || {
+          weekly_runs: 0,
+          weekly_dollars: 0,
+        }
         perVersionMetricsMap.set(key, {
-          weekly_dollars: perVersionWeeklyMap.get(key) || 0,
+          weekly_runs: weeklyData.weekly_runs,
+          weekly_dollars: weeklyData.weekly_dollars,
           total_dollars: Number(metric.total_dollars),
           total_invocations: Number(metric.total_invocations),
           avg_cost_per_run: Number(metric.avg_cost_per_run),
@@ -212,6 +230,7 @@ const getCachedAgents = unstable_cache(
       ({ agent, agentData, agentName }) => {
         const agentKey = `${agent.publisher.id}/${agentName}`
         const metrics = metricsMap.get(agentKey) || {
+          weekly_runs: 0,
           weekly_dollars: 0,
           total_dollars: 0,
           total_invocations: 0,
@@ -233,6 +252,7 @@ const getCachedAgents = unstable_cache(
           created_at: agent.created_at,
           // Aggregated stats across all versions (for agent store)
           usage_count: metrics.total_invocations,
+          weekly_runs: metrics.weekly_runs,
           weekly_spent: metrics.weekly_dollars,
           total_spent: metrics.total_dollars,
           avg_cost_per_invocation: metrics.avg_cost_per_run,

web/src/app/publishers/[id]/agents/[agentId]/[version]/agent-usage-metrics.tsx

@@ -16,13 +16,15 @@ interface AgentData {
     id: string
   }
   usage_count?: number
+  weekly_runs?: number
   weekly_spent?: number
   avg_cost_per_invocation?: number
   unique_users?: number
   last_used?: string
   version_stats?: Record<
     string,
     {
+      weekly_runs: number
       weekly_dollars: number
       total_dollars: number
       total_invocations: number
@@ -70,6 +72,7 @@ export const AgentUsageMetrics = ({
   const usageMetrics = version
     ? agent?.version_stats?.[version]
       ? {
+          weekly_runs: agent.version_stats[version].weekly_runs,
           weekly_spent: agent.version_stats[version].weekly_dollars,
           usage_count: agent.version_stats[version].total_invocations,
           avg_cost_per_invocation:
@@ -78,6 +81,7 @@ export const AgentUsageMetrics = ({
           last_used: agent.version_stats[version].last_used?.toString(),
         }
       : {
+          weekly_runs: 0,
           weekly_spent: 0,
           usage_count: 0,
           avg_cost_per_invocation: 0,
@@ -105,15 +109,24 @@ export const AgentUsageMetrics = ({
 
   return (
     <div>
-      <div className="grid grid-cols-1 xs:grid-cols-2 lg:grid-cols-4 gap-4 sm:gap-6">
+      <div className="grid grid-cols-2 xs:grid-cols-3 lg:grid-cols-5 gap-4 sm:gap-6">
         <div className="flex flex-col items-center gap-2">
           <div className="flex items-center gap-2">
             <TrendingUp className="h-4 w-4 text-emerald-400" />
             <span className="font-medium text-emerald-300">
               {formatCurrency(usageMetrics.weekly_spent)}
             </span>
           </div>
-          <span className="text-xs text-muted-foreground">Weekly Usage</span>
+          <span className="text-xs text-muted-foreground">Weekly Spend</span>
+        </div>
+        <div className="flex flex-col items-center gap-2">
+          <div className="flex items-center gap-2">
+            <Play className="h-4 w-4 text-blue-400" />
+            <span className="font-medium text-blue-300">
+              {formatUsageCount(usageMetrics.weekly_runs)}
+            </span>
+          </div>
+          <span className="text-xs text-muted-foreground">Weekly Runs</span>
         </div>
         <div className="flex flex-col items-center gap-2">
           <div className="flex items-center gap-2">

web/src/app/store/agents-data.ts

@@ -14,6 +14,7 @@ interface AgentData {
   version: string
   created_at: string
   usage_count?: number
+  weekly_runs?: number
   weekly_spent?: number
   total_spent?: number
   avg_cost_per_invocation?: number
@@ -28,7 +29,7 @@ export const getAgentsData = unstable_cache(
   async (): Promise<AgentData[]> => {
     const baseUrl =
       process.env.NEXT_PUBLIC_CODEBUFF_APP_URL || 'http://localhost:3000'
-    
+
     try {
       const response = await fetch(`${baseUrl}/api/agents`, {
         headers: {

web/src/app/store/page.tsx

@@ -3,39 +3,6 @@ import { Suspense } from 'react'
 import AgentStoreClient from './store-client'
 import { getAgentsData } from './agents-data'
 
-// Types
-interface AgentData {
-  id: string
-  name: string
-  description?: string
-  publisher: {
-    id: string
-    name: string
-    verified: boolean
-    avatar_url?: string | null
-  }
-  version: string
-  created_at: string
-  usage_count?: number
-  weekly_spent?: number // In dollars
-  total_spent?: number // In dollars
-  avg_cost_per_invocation?: number // In dollars
-  unique_users?: number
-  last_used?: string
-  version_stats?: Record<
-    string,
-    {
-      weekly_dollars: number
-      total_dollars: number
-      total_invocations: number
-      avg_cost_per_run: number
-      unique_users: number
-      last_used?: Date
-    }
-  >
-  tags?: string[]
-}
-
 interface PublisherProfileResponse {
   id: string
   name: string

web/src/app/store/store-client.tsx

@@ -47,6 +47,7 @@ interface AgentData {
   version: string
   created_at: string
   usage_count?: number
+  weekly_runs?: number
   weekly_spent?: number
   total_spent?: number
   avg_cost_per_invocation?: number
@@ -483,7 +484,7 @@ export default function AgentStoreClient({
                 <div className="flex items-center gap-2">
                   <Play className="h-4 w-4 text-muted-foreground" />
                   <span className="font-semibold">
-                    {formatUsageCount(agent.usage_count)}
+                    {formatUsageCount(agent.weekly_runs)}
                   </span>
                 </div>
                 <p className="text-xs text-muted-foreground">Weekly runs</p>