fix(billing): scope daily refresh by entity stamps and close lagging periods before deletion settlement

The refresh actor-list threading (userIds + departed-actor unions) violated
the entity-stamp principle the ledger sums already follow: org-attributed
rows from departed members counted in pooled usage but never consumed
refresh on the monitor/resolved-usage paths. Daily refresh now scopes rows
by the same write-time entity and period stamps as the ledger — no actor
list anywhere — which deletes the unions, the rollup memberIds, and the
org-specific refresh variant.

Deletion settlement now closes any elapsed-but-unclosed period (grace
bypassed — no later sweep revisits a canceled sub) before claiming the
terminal period, so a deletion racing the sweep can no longer jump the
marker past an unsettled period and silently forgive its final overage.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: icecrasher321

apps/sim/lib/billing/calculations/usage-monitor.test.ts

@@ -8,15 +8,13 @@ const {
   mockGetBillingPeriodUsageCost,
   mockGetOrgMemberUsageForBillingPeriod,
   mockGetOrgMemberUsageLimit,
-  mockGetOrgMemberBillingRollup,
   mockGetUserUsageLimit,
   mockIsOrganizationBillingBlocked,
   mockComputeBillingPeriodUsageWithDailyRefresh,
 } = vi.hoisted(() => ({
   mockGetBillingPeriodUsageCost: vi.fn(),
   mockGetOrgMemberUsageForBillingPeriod: vi.fn(),
   mockGetOrgMemberUsageLimit: vi.fn(),
-  mockGetOrgMemberBillingRollup: vi.fn(),
   mockGetUserUsageLimit: vi.fn(),
   mockIsOrganizationBillingBlocked: vi.fn(),
   mockComputeBillingPeriodUsageWithDailyRefresh: vi.fn(),
@@ -31,10 +29,9 @@ vi.mock('@/lib/billing/core/access', () => ({
   isOrganizationBillingBlocked: mockIsOrganizationBillingBlocked,
 }))
 
-// core/usage pulls in the email-rendering chain at import; stub the two symbols
+// core/usage pulls in the email-rendering chain at import; stub the symbol
 // usage-monitor imports from it so the module loads in a node test env.
 vi.mock('@/lib/billing/core/usage', () => ({
-  getOrgMemberBillingRollup: mockGetOrgMemberBillingRollup,
   getUserUsageLimit: mockGetUserUsageLimit,
 }))
 
@@ -106,7 +103,6 @@ describe('checkUsageStatus', () => {
       { type: 'organization', id: 'org-1' },
       billingPeriod
     )
-    expect(mockGetOrgMemberBillingRollup).not.toHaveBeenCalled()
   })
 
   it('reads paid personal ledger usage and refresh from one snapshot', async () => {
@@ -128,7 +124,6 @@ describe('checkUsageStatus', () => {
     expect(mockComputeBillingPeriodUsageWithDailyRefresh).toHaveBeenCalledWith({
       billingEntity: { type: 'user', id: 'user-1' },
       billingPeriod: { start: periodStart, end: periodEnd },
-      userIds: ['user-1'],
       refreshPeriodStart: periodStart,
       refreshPeriodEnd: periodEnd,
       planDollars: 20,
@@ -202,7 +197,7 @@ describe('checkUsageStatus', () => {
     expect(mockComputeBillingPeriodUsageWithDailyRefresh).not.toHaveBeenCalled()
   })
 
-  it('combines paid organization ledger usage with member refresh', async () => {
+  it('combines paid organization ledger usage with entity-scoped refresh — no roster read', async () => {
     const periodStart = new Date('2026-06-01T00:00:00.000Z')
     const periodEnd = new Date('2026-07-01T00:00:00.000Z')
     const subscription = {
@@ -213,10 +208,6 @@ describe('checkUsageStatus', () => {
       periodStart,
       periodEnd,
     }
-    mockGetOrgMemberBillingRollup.mockResolvedValue({
-      memberIds: ['user-1', 'user-2'],
-      lastPeriodCost: 0,
-    })
     mockComputeBillingPeriodUsageWithDailyRefresh.mockResolvedValue({
       ledgerUsage: 100,
       refreshConsumed: 10,
@@ -228,43 +219,22 @@ describe('checkUsageStatus', () => {
       organizationId: 'org-1',
     })
 
+    // Refresh is scoped by the entity stamps alone, so departed members'
+    // org-attributed rows participate identically to current members'.
     expect(mockComputeBillingPeriodUsageWithDailyRefresh).toHaveBeenCalledWith({
       billingEntity: { type: 'organization', id: 'org-1' },
       billingPeriod: expect.objectContaining({
         start: periodStart,
         end: periodEnd,
         source: 'stripe',
       }),
-      userIds: ['user-1', 'user-2'],
       refreshPeriodStart: periodStart,
       refreshPeriodEnd: periodEnd,
       planDollars: expect.any(Number),
       seats: 2,
     })
     expect(mockGetBillingPeriodUsageCost).not.toHaveBeenCalled()
   })
-
-  it('returns ledger usage without refresh when an organization has no members', async () => {
-    const periodStart = new Date('2026-06-01T00:00:00.000Z')
-    const periodEnd = new Date('2026-07-01T00:00:00.000Z')
-    const subscription = {
-      referenceId: 'org-1',
-      plan: 'team',
-      status: 'active',
-      seats: 1,
-      periodStart,
-      periodEnd,
-    }
-    mockGetOrgMemberBillingRollup.mockResolvedValue({ memberIds: [], lastPeriodCost: 0 })
-
-    await expect(checkUsageStatus('user-1', subscription)).resolves.toMatchObject({
-      currentUsage: 125,
-      scope: 'organization',
-    })
-
-    expect(mockGetBillingPeriodUsageCost).toHaveBeenCalledTimes(1)
-    expect(mockComputeBillingPeriodUsageWithDailyRefresh).not.toHaveBeenCalled()
-  })
 })
 
 describe('checkServerSideUsageLimits', () => {

apps/sim/lib/billing/calculations/usage-monitor.ts

@@ -7,11 +7,7 @@ import { isOrganizationBillingBlocked } from '@/lib/billing/core/access'
 import { defaultBillingPeriod } from '@/lib/billing/core/billing-period'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/plan'
 import { resolveSubscriptionUsagePeriod } from '@/lib/billing/core/reporting-period'
-import {
-  getOrgMemberBillingRollup,
-  getUserUsageLimit,
-  type UsageLimitSubscription,
-} from '@/lib/billing/core/usage'
+import { getUserUsageLimit, type UsageLimitSubscription } from '@/lib/billing/core/usage'
 import {
   type BillingContext,
   type BillingEntity,
@@ -70,15 +66,9 @@ async function computePooledOrgUsage(
     return getBillingPeriodUsageCost({ type: 'organization', id: organizationId }, billingPeriod)
   }
 
-  const { memberIds } = await getOrgMemberBillingRollup(organizationId)
-  if (memberIds.length === 0) {
-    return getBillingPeriodUsageCost({ type: 'organization', id: organizationId }, billingPeriod)
-  }
-
   const { ledgerUsage, refreshConsumed } = await computeBillingPeriodUsageWithDailyRefresh({
     billingEntity: { type: 'organization', id: organizationId },
     billingPeriod,
-    userIds: memberIds,
     refreshPeriodStart: sub.periodStart,
     refreshPeriodEnd: sub.periodEnd ?? null,
     planDollars,
@@ -151,7 +141,6 @@ export async function checkUsageStatus(
         const usage = await computeBillingPeriodUsageWithDailyRefresh({
           billingEntity: { type: 'user', id: userId },
           billingPeriod,
-          userIds: [userId],
           refreshPeriodStart: sub.periodStart,
           refreshPeriodEnd: sub.periodEnd ?? null,
           planDollars,

apps/sim/lib/billing/core/billing.test.ts

@@ -8,7 +8,6 @@ const {
   mockComputeDailyRefreshConsumed,
   mockEnsureUserStatsExists,
   mockGetBillingPeriodUsageCost,
-  mockGetBillingPeriodUsageCostByUser,
   mockGetBillingPeriodUsageCostWithSourceSubset,
   mockGetHighestPriorityPersonalSubscription,
   mockGetHighestPrioritySubscription,
@@ -17,7 +16,6 @@ const {
   mockComputeDailyRefreshConsumed: vi.fn(),
   mockEnsureUserStatsExists: vi.fn(),
   mockGetBillingPeriodUsageCost: vi.fn(),
-  mockGetBillingPeriodUsageCostByUser: vi.fn(),
   mockGetBillingPeriodUsageCostWithSourceSubset: vi.fn(),
   mockGetHighestPriorityPersonalSubscription: vi.fn(),
   mockGetHighestPrioritySubscription: vi.fn(),
@@ -39,7 +37,6 @@ vi.mock('@/lib/billing/core/usage', () => ({
 vi.mock('@/lib/billing/core/usage-log', () => ({
   COPILOT_USAGE_SOURCES: ['copilot'],
   getBillingPeriodUsageCost: mockGetBillingPeriodUsageCost,
-  getBillingPeriodUsageCostByUser: mockGetBillingPeriodUsageCostByUser,
   getBillingPeriodUsageCostWithSourceSubset: mockGetBillingPeriodUsageCostWithSourceSubset,
 }))
 
@@ -129,17 +126,12 @@ describe('calculateSubscriptionOverage', () => {
     mockComputeDailyRefreshConsumed.mockResolvedValue(0)
   })
 
-  it('includes departed ledger actors in the org refresh deduction', async () => {
+  it('bills the pooled org ledger with entity-scoped refresh — no roster read', async () => {
     queueTableRows(schemaMock.organization, [{ id: 'org-1' }]) // isSubscriptionOrgScoped
-    queueTableRows(schemaMock.member, [{ userId: 'owner-1' }]) // current members
-    mockGetBillingPeriodUsageCostByUser.mockResolvedValue(
-      new Map([
-        ['owner-1', 100],
-        ['departed-1', 60],
-      ])
-    )
+    // Pooled ledger sum includes departed members' org-stamped rows.
+    mockGetBillingPeriodUsageCost.mockResolvedValue(160)
 
-    await calculateSubscriptionOverage({
+    const overage = await calculateSubscriptionOverage({
       id: 'sub-1',
       plan: 'team',
       referenceId: 'org-1',
@@ -148,10 +140,22 @@ describe('calculateSubscriptionOverage', () => {
       periodEnd: new Date('2026-08-01T00:00:00.000Z'),
     })
 
-    expect(mockComputeDailyRefreshConsumed).toHaveBeenCalledWith(
-      expect.objectContaining({
-        userIds: expect.arrayContaining(['owner-1', 'departed-1']),
-      })
+    expect(mockGetBillingPeriodUsageCost).toHaveBeenCalledWith(
+      { type: 'organization', id: 'org-1' },
+      {
+        start: new Date('2026-07-01T00:00:00.000Z'),
+        end: new Date('2026-08-01T00:00:00.000Z'),
+      }
     )
+    // Refresh is scoped by the same entity stamps as the ledger sum — no
+    // actor list, so departed members' rows participate identically.
+    expect(mockComputeDailyRefreshConsumed).toHaveBeenCalledWith({
+      billingEntity: { type: 'organization', id: 'org-1' },
+      periodStart: new Date('2026-07-01T00:00:00.000Z'),
+      periodEnd: new Date('2026-08-01T00:00:00.000Z'),
+      planDollars: 40,
+      seats: 2,
+    })
+    expect(overage).toBe(80)
   })
 })

apps/sim/lib/billing/core/billing.ts

@@ -1,5 +1,5 @@
 import { db } from '@sim/db'
-import { member, organization, subscription, userStats } from '@sim/db/schema'
+import { organization, subscription, userStats } from '@sim/db/schema'
 import { and, desc, eq, inArray } from 'drizzle-orm'
 import { defaultBillingPeriod } from '@/lib/billing/core/billing-period'
 import {
@@ -10,7 +10,6 @@ import { ensureUserStatsExists } from '@/lib/billing/core/usage'
 import {
   COPILOT_USAGE_SOURCES,
   getBillingPeriodUsageCost,
-  getBillingPeriodUsageCostByUser,
   getBillingPeriodUsageCostWithSourceSubset,
 } from '@/lib/billing/core/usage-log'
 import { computeDailyRefreshConsumed } from '@/lib/billing/credits/daily-refresh'
@@ -124,7 +123,6 @@ export async function computeOrgOverageAmount(params: {
   periodEnd: Date | null
   organizationId: string
   pooledLedgerUsage: number
-  memberIds: string[]
 }): Promise<{
   effectiveUsage: number
   baseSubscriptionAmount: number
@@ -135,14 +133,13 @@ export async function computeOrgOverageAmount(params: {
 
   let dailyRefreshDeduction = 0
   const planDollars = getPlanTierDollars(params.plan)
-  if (planDollars > 0 && params.periodStart && params.memberIds.length > 0) {
+  if (planDollars > 0 && params.periodStart) {
     dailyRefreshDeduction = await computeDailyRefreshConsumed({
-      userIds: params.memberIds,
+      billingEntity: { type: 'organization', id: params.organizationId },
       periodStart: params.periodStart,
       periodEnd: params.periodEnd ?? null,
       planDollars,
       seats: params.seats || 1,
-      billingEntity: { type: 'organization', id: params.organizationId },
     })
   }
 
@@ -180,23 +177,13 @@ export async function calculateSubscriptionOverage(sub: {
   const isOrgScoped = await isSubscriptionOrgScoped(sub)
 
   if (isOrgScoped) {
-    const memberRows = await db
-      .select({ userId: member.userId })
-      .from(member)
-      .where(eq(member.organizationId, sub.referenceId))
-    const usageByUser =
+    const ledgerUsage =
       sub.periodStart && sub.periodEnd
-        ? await getBillingPeriodUsageCostByUser(
+        ? await getBillingPeriodUsageCost(
             { type: 'organization', id: sub.referenceId },
             { start: sub.periodStart, end: sub.periodEnd }
           )
-        : new Map<string, number>()
-    let ledgerUsage = 0
-    for (const cost of usageByUser.values()) ledgerUsage += cost
-    // Union current members with every actor holding org-attributed rows this
-    // period: a member who departed mid-period still bills here, so their
-    // daily-refresh consumption must offset the overage too.
-    const memberIds = [...new Set([...memberRows.map((row) => row.userId), ...usageByUser.keys()])]
+        : 0
 
     const { totalOverage, effectiveUsage, baseSubscriptionAmount } = await computeOrgOverageAmount({
       plan: sub.plan,
@@ -205,7 +192,6 @@ export async function calculateSubscriptionOverage(sub: {
       periodEnd: sub.periodEnd ?? null,
       organizationId: sub.referenceId,
       pooledLedgerUsage: ledgerUsage,
-      memberIds,
     })
 
     totalOverageDecimal = toDecimal(totalOverage)
@@ -238,11 +224,10 @@ export async function calculateSubscriptionOverage(sub: {
       const planDollars = getPlanTierDollars(sub.plan)
       if (planDollars > 0 && sub.periodStart) {
         dailyRefreshDeduction = await computeDailyRefreshConsumed({
-          userIds: [sub.referenceId],
+          billingEntity: { type: 'user', id: sub.referenceId },
           periodStart: sub.periodStart,
           periodEnd: sub.periodEnd ?? null,
           planDollars,
-          billingEntity: { type: 'user', id: sub.referenceId },
         })
       }
     }
@@ -322,11 +307,10 @@ export async function getPersonalBillingSummary(userId: string, executor: DbClie
       if (planDollars > 0) {
         refreshDeduction = await computeDailyRefreshConsumed(
           {
-            userIds: [userId],
+            billingEntity: { type: 'user', id: userId },
             periodStart: personalSubscription.periodStart,
             periodEnd: personalSubscription.periodEnd ?? null,
             planDollars,
-            billingEntity: { type: 'user', id: userId },
           },
           executor
         )

apps/sim/lib/billing/core/organization.ts

@@ -10,7 +10,7 @@ import {
   getBillingPeriodUsageCostByUser,
   type UsageQueryPeriod,
 } from '@/lib/billing/core/usage-log'
-import { computeOrganizationDailyRefreshConsumed } from '@/lib/billing/credits/daily-refresh'
+import { computeDailyRefreshConsumed } from '@/lib/billing/credits/daily-refresh'
 import { getPlanTierDollars, isEnterprise, isPaid } from '@/lib/billing/plan-helpers'
 import {
   getEffectiveSeats,
@@ -274,9 +274,9 @@ export async function getOrganizationBillingData(
     if (isPaid(subscription.plan) && subscription.periodStart) {
       const planDollars = getPlanTierDollars(subscription.plan)
       if (planDollars > 0) {
-        const refreshConsumed = await computeOrganizationDailyRefreshConsumed(
+        const refreshConsumed = await computeDailyRefreshConsumed(
           {
-            organizationId: subscription.referenceId,
+            billingEntity: { type: 'organization', id: subscription.referenceId },
             periodStart: subscription.periodStart,
             periodEnd: subscription.periodEnd ?? null,
             planDollars,