address comments

Author: icecrasher321

apps/sim/app/api/billing/route.ts

@@ -140,7 +140,6 @@ export const GET = withRouteHandler(async (request: NextRequest) => {
         members: rawBillingData.members.map((m) => ({
           ...m,
           joinedAt: m.joinedAt.toISOString(),
-          lastActive: m.lastActive?.toISOString() || null,
         })),
       }
 

apps/sim/app/api/organizations/[id]/members/[memberId]/route.ts

@@ -12,6 +12,7 @@ import { parseRequest } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
 import { setActiveOrganizationForCurrentSession } from '@/lib/auth/active-organization'
 import { getUserUsageData } from '@/lib/billing/core/usage'
+import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
 import {
   removeExternalUserFromOrganizationWorkspaces,
   removeUserFromOrganization,
@@ -101,10 +102,25 @@ export const GET = withRouteHandler(
         const computed = await getUserUsageData(memberId)
 
         if (usageData.length > 0) {
+          // currentPeriodCost is only a baseline; add this member's attributed
+          // usage_log for the period. (getUserUsageData returns the org POOL for
+          // org-scoped members, so it can't supply the per-member figure.)
+          const memberLedger =
+            computed.billingPeriodStart && computed.billingPeriodEnd
+              ? ((
+                  await getBillingPeriodUsageCostByUser(
+                    { type: 'organization', id: organizationId },
+                    { start: computed.billingPeriodStart, end: computed.billingPeriodEnd }
+                  )
+                ).get(memberId) ?? 0)
+              : 0
           memberData = {
             ...memberData,
             usage: {
               ...usageData[0],
+              currentPeriodCost: (
+                Number(usageData[0].currentPeriodCost ?? 0) + memberLedger
+              ).toString(),
               billingPeriodStart: computed.billingPeriodStart,
               billingPeriodEnd: computed.billingPeriodEnd,
             },

apps/sim/app/api/organizations/[id]/members/route.ts

@@ -17,6 +17,7 @@ import {
 } from '@/lib/api/contracts/organization'
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
+import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
 import { ENTITLED_SUBSCRIPTION_STATUSES } from '@/lib/billing/subscriptions/utils'
 import { validateSeatAvailability } from '@/lib/billing/validation/seat-management'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -139,8 +140,21 @@ export const GET = withRouteHandler(
         const billingPeriodStart = orgSub?.periodStart ?? null
         const billingPeriodEnd = orgSub?.periodEnd ?? null
 
+        // currentPeriodCost is only a baseline; add each member's attributed
+        // usage_log for the period (batched, one query) so the roster shows real
+        // usage rather than the frozen baseline.
+        const usageByUser =
+          billingPeriodStart && billingPeriodEnd
+            ? await getBillingPeriodUsageCostByUser(
+                { type: 'organization', id: organizationId },
+                { start: billingPeriodStart, end: billingPeriodEnd }
+              )
+            : new Map<string, number>()
+
         const membersWithUsage = base.map((row) => ({
           ...row,
+          currentPeriodCost:
+            Number(row.currentPeriodCost ?? 0) + (usageByUser.get(row.userId) ?? 0),
           billingPeriodStart,
           billingPeriodEnd,
         }))

apps/sim/app/api/v1/admin/organizations/[id]/members/[memberId]/route.ts

@@ -35,6 +35,8 @@ import {
   adminV1UpdateOrganizationMemberContract,
 } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
+import { getOrganizationSubscription } from '@/lib/billing/core/billing'
+import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
 import { removeUserFromOrganization } from '@/lib/billing/organizations/membership'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -86,7 +88,6 @@ export const GET = withRouteHandler(
           userEmail: user.email,
           currentPeriodCost: userStats.currentPeriodCost,
           currentUsageLimit: userStats.currentUsageLimit,
-          lastActive: userStats.lastActive,
           billingBlocked: userStats.billingBlocked,
         })
         .from(member)
@@ -99,6 +100,20 @@ export const GET = withRouteHandler(
         return notFoundResponse('Member')
       }
 
+      // currentPeriodCost is only a baseline; add this member's attributed
+      // usage_log for the org's period so admin shows real current usage.
+      const subscription = await getOrganizationSubscription(organizationId)
+      const billingPeriod =
+        subscription?.periodStart && subscription?.periodEnd
+          ? { start: subscription.periodStart, end: subscription.periodEnd }
+          : null
+      const ledgerByUser = billingPeriod
+        ? await getBillingPeriodUsageCostByUser(
+            { type: 'organization', id: organizationId },
+            billingPeriod
+          )
+        : new Map<string, number>()
+
       const data: AdminMemberDetail = {
         id: memberData.id,
         userId: memberData.userId,
@@ -107,9 +122,10 @@ export const GET = withRouteHandler(
         createdAt: memberData.createdAt.toISOString(),
         userName: memberData.userName,
         userEmail: memberData.userEmail,
-        currentPeriodCost: memberData.currentPeriodCost ?? '0',
+        currentPeriodCost: (
+          Number(memberData.currentPeriodCost ?? 0) + (ledgerByUser.get(memberData.userId) ?? 0)
+        ).toString(),
         currentUsageLimit: memberData.currentUsageLimit,
-        lastActive: memberData.lastActive?.toISOString() ?? null,
         billingBlocked: memberData.billingBlocked ?? false,
       }
 

apps/sim/app/api/v1/admin/organizations/[id]/members/route.ts

@@ -37,6 +37,8 @@ import {
   adminV1ListOrganizationMembersContract,
 } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
+import { getOrganizationSubscription } from '@/lib/billing/core/billing'
+import { getBillingPeriodUsageCostByUser } from '@/lib/billing/core/usage-log'
 import { addUserToOrganization } from '@/lib/billing/organizations/membership'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -96,7 +98,6 @@ export const GET = withRouteHandler(
             userEmail: user.email,
             currentPeriodCost: userStats.currentPeriodCost,
             currentUsageLimit: userStats.currentUsageLimit,
-            lastActive: userStats.lastActive,
             billingBlocked: userStats.billingBlocked,
           })
           .from(member)
@@ -109,6 +110,21 @@ export const GET = withRouteHandler(
       ])
 
       const total = countResult[0].count
+
+      // currentPeriodCost is only a baseline; add each member's attributed
+      // usage_log for the org's period so admin shows real current usage.
+      const subscription = await getOrganizationSubscription(organizationId)
+      const billingPeriod =
+        subscription?.periodStart && subscription?.periodEnd
+          ? { start: subscription.periodStart, end: subscription.periodEnd }
+          : null
+      const usageByUser = billingPeriod
+        ? await getBillingPeriodUsageCostByUser(
+            { type: 'organization', id: organizationId },
+            billingPeriod
+          )
+        : new Map<string, number>()
+
       const data: AdminMemberDetail[] = membersData.map((m) => ({
         id: m.id,
         userId: m.userId,
@@ -117,9 +133,10 @@ export const GET = withRouteHandler(
         createdAt: m.createdAt.toISOString(),
         userName: m.userName,
         userEmail: m.userEmail,
-        currentPeriodCost: m.currentPeriodCost ?? '0',
+        currentPeriodCost: (
+          Number(m.currentPeriodCost ?? 0) + (usageByUser.get(m.userId) ?? 0)
+        ).toString(),
         currentUsageLimit: m.currentUsageLimit,
-        lastActive: m.lastActive?.toISOString() ?? null,
         billingBlocked: m.billingBlocked ?? false,
       }))
 

apps/sim/app/api/v1/admin/organizations/[id]/seats/route.ts

@@ -51,16 +51,6 @@ export const GET = withRouteHandler(
         subscriptionPlan: analytics.subscriptionPlan,
         canAddSeats: analytics.canAddSeats,
         utilizationRate: analytics.utilizationRate,
-        activeMembers: analytics.activeMembers,
-        inactiveMembers: analytics.inactiveMembers,
-        memberActivity: analytics.memberActivity.map((m) => ({
-          userId: m.userId,
-          userName: m.userName,
-          userEmail: m.userEmail,
-          role: m.role,
-          joinedAt: m.joinedAt.toISOString(),
-          lastActive: m.lastActive?.toISOString() ?? null,
-        })),
       }
 
       logger.info(`Admin API: Retrieved seat analytics for organization ${organizationId}`)

apps/sim/app/api/v1/admin/types.ts

@@ -543,7 +543,6 @@ export interface AdminMemberDetail extends AdminMember {
   // Billing/usage info from userStats
   currentPeriodCost: string
   currentUsageLimit: string | null
-  lastActive: string | null
   billingBlocked: boolean
 }
 
@@ -574,20 +573,15 @@ interface AdminUserBilling {
   userEmail: string
   stripeCustomerId: string | null
   // Usage stats
-  totalCost: string
   currentUsageLimit: string | null
   currentPeriodCost: string
   lastPeriodCost: string | null
   billedOverageThisPeriod: string
   storageUsedBytes: number
-  lastActive: string | null
   billingBlocked: boolean
-  // Copilot usage
-  totalCopilotCost: string
+  // Copilot usage (active per-period baselines)
   currentPeriodCopilotCost: string
   lastPeriodCopilotCost: string | null
-  totalCopilotTokens: number
-  totalCopilotCalls: number
 }
 
 export interface AdminUserBillingWithSubscription extends AdminUserBilling {
@@ -635,16 +629,6 @@ export interface AdminSeatAnalytics {
   subscriptionPlan: string
   canAddSeats: boolean
   utilizationRate: number
-  activeMembers: number
-  inactiveMembers: number
-  memberActivity: Array<{
-    userId: string
-    userName: string
-    userEmail: string
-    role: string
-    joinedAt: string
-    lastActive: string | null
-  }>
 }
 
 export interface AdminDeploymentVersion {

apps/sim/app/api/v1/admin/users/[id]/billing/route.ts

@@ -29,6 +29,7 @@ import {
 } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
+import { getUserUsageData } from '@/lib/billing/core/usage'
 import { isOrgScopedSubscription } from '@/lib/billing/subscriptions/utils'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
@@ -78,6 +79,11 @@ export const GET = withRouteHandler(
 
       const [stats] = await db.select().from(userStats).where(eq(userStats.userId, userId)).limit(1)
 
+      // currentPeriodCost is now only a baseline; canonical current-period usage
+      // (baseline + attributed usage_log, refresh-adjusted) comes from the same
+      // helper users see, so admin reflects real usage instead of a stale 0.
+      const usage = await getUserUsageData(userId)
+
       const memberOrgs = await db
         .select({
           organizationId: member.organizationId,
@@ -107,19 +113,14 @@ export const GET = withRouteHandler(
         userName: userData.name,
         userEmail: userData.email,
         stripeCustomerId: userData.stripeCustomerId,
-        totalCost: stats?.totalCost ?? '0',
         currentUsageLimit: stats?.currentUsageLimit ?? null,
-        currentPeriodCost: stats?.currentPeriodCost ?? '0',
+        currentPeriodCost: usage.currentUsage.toString(),
         lastPeriodCost: stats?.lastPeriodCost ?? null,
         billedOverageThisPeriod: stats?.billedOverageThisPeriod ?? '0',
         storageUsedBytes: stats?.storageUsedBytes ?? 0,
-        lastActive: stats?.lastActive?.toISOString() ?? null,
         billingBlocked: stats?.billingBlocked ?? false,
-        totalCopilotCost: stats?.totalCopilotCost ?? '0',
         currentPeriodCopilotCost: stats?.currentPeriodCopilotCost ?? '0',
         lastPeriodCopilotCost: stats?.lastPeriodCopilotCost ?? null,
-        totalCopilotTokens: stats?.totalCopilotTokens ?? 0,
-        totalCopilotCalls: stats?.totalCopilotCalls ?? 0,
         subscriptions: subscriptions.map(toAdminSubscription),
         organizationMemberships: memberOrgs.map((m) => ({
           organizationId: m.organizationId,

apps/sim/lib/api/contracts/subscription.ts

@@ -103,7 +103,6 @@ export const organizationBillingMemberSchema = z
     userName: z.string().nullable().optional(),
     userEmail: z.string().nullable().optional(),
     joinedAt: z.string().nullable().optional(),
-    lastActive: z.string().nullable().optional(),
   })
   .passthrough()
 

apps/sim/lib/api/contracts/v1/admin/organizations.ts

@@ -43,7 +43,6 @@ export const adminV1MemberSchema = z.object({
 export const adminV1MemberDetailSchema = adminV1MemberSchema.extend({
   currentPeriodCost: z.string(),
   currentUsageLimit: z.string().nullable(),
-  lastActive: z.string().nullable(),
   billingBlocked: z.boolean(),
 })
 
@@ -75,18 +74,6 @@ export const adminV1SeatAnalyticsSchema = z.object({
   subscriptionPlan: z.string(),
   canAddSeats: z.boolean(),
   utilizationRate: z.number(),
-  activeMembers: z.number(),
-  inactiveMembers: z.number(),
-  memberActivity: z.array(
-    z.object({
-      userId: z.string(),
-      userName: z.string(),
-      userEmail: z.string(),
-      role: z.string(),
-      joinedAt: z.string(),
-      lastActive: z.string().nullable(),
-    })
-  ),
 })
 
 export const adminV1CreateOrganizationBodySchema = z.object({