progress

Author: icecrasher321

apps/sim/app/api/billing/switch-plan/route.ts

@@ -94,9 +94,6 @@ export async function POST(request: NextRequest) {
       )
     }
 
-    // Any subscription whose referenceId is an organization (team,
-    // enterprise, or `pro_*` attached to an org) requires org admin/owner
-    // to change the plan.
     if (isOrgScopedSubscription(sub, userId)) {
       const hasPermission = await isOrganizationOwnerOrAdmin(userId, sub.referenceId)
       if (!hasPermission) {

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

@@ -356,9 +356,6 @@ export async function PUT(
             .limit(1)
 
           const orgSub = orgSubs[0]
-          // Any paid subscription attached to the org triggers the
-          // "snapshot my personal Pro usage and cancel it" flow — includes
-          // `pro_*` plans transferred to the org, not just team/enterprise.
           const orgIsPaid = orgSub && isPaid(orgSub.plan)
 
           if (orgIsPaid) {
@@ -414,23 +411,14 @@ export async function PUT(
               }
             }
 
-            // Transfer the joining user's accumulated personal storage
-            // bytes into the organization's pool. After this point
-            // `isOrgScopedSubscription` returns true for the user, so
-            // `getUserStorageUsage`/`incrementStorageUsage`/`decrementStorageUsage`
-            // all route through `organization.storageUsedBytes`. Without
-            // this transfer, pre-join bytes would be orphaned on the
-            // user's row and subsequent decrements (deleting a pre-join
-            // file after joining) would wrongly reduce the org pool.
-            //
-            // `.for('update')` acquires a row-level write lock on the
-            // user's `user_stats` row so a concurrent
-            // `incrementStorageUsage`/`decrementStorageUsage` (from
-            // another tab, a scheduled run, an API-key writer, etc.)
-            // blocks until this transaction commits — otherwise Postgres
-            // READ COMMITTED would let a write land between the snapshot
-            // SELECT and the zero UPDATE, silently dropping those bytes.
-            // Mirrors the bulk version in `syncSubscriptionUsageLimits`.
+            // Transfer the joining user's pre-join storage bytes into
+            // the org pool — after this point storage reads/writes route
+            // through `organization.storageUsedBytes`, so bytes left on
+            // `user_stats` would be orphaned (and a later decrement from
+            // deleting a pre-join file would wrongly reduce the org
+            // pool). `.for('update')` row-locks `user_stats` so a
+            // concurrent increment/decrement can't land between the
+            // SELECT and the zero UPDATE and get silently dropped.
             const storageRows = await tx
               .select({ storageUsedBytes: userStats.storageUsedBytes })
               .from(userStats)

apps/sim/app/api/v1/admin/credits/route.ts

@@ -111,9 +111,7 @@ export const POST = withAdminAuth(async (request) => {
     const plan = userSubscription.plan
     let seats: number | null = null
 
-    // Route admin credits to the subscription's actual entity. Any sub whose
-    // `referenceId` is an org gets credited to the org pool — including
-    // `pro_*` plans transferred to an org.
+    // Route admin credits to the subscription's entity (org if org-scoped).
     if (isOrgScopedSubscription(userSubscription, resolvedUserId)) {
       entityType = 'organization'
       entityId = userSubscription.referenceId

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

@@ -155,9 +155,6 @@ export const PATCH = withAdminAuthParams<RouteParams>(async (request, context) =
       .limit(1)
 
     const userSubscription = await getHighestPrioritySubscription(userId)
-    // True for any user whose effective subscription is attached to an org
-    // (team, enterprise, or `pro_*` transferred to an org). They have no
-    // individual usage limit — the org cap governs.
     const isOrgScopedMember = isOrgScopedSubscription(userSubscription, userId)
 
     const [orgMembership] = await db

apps/sim/app/workspace/[workspaceId]/settings/components/subscription/subscription-permissions.ts

@@ -39,9 +39,8 @@ export function getSubscriptionPermissions(
   const { isFree, isPro, isTeam, isEnterprise, isPaid, isOrgScoped } = subscription
   const { isTeamAdmin } = userRole
 
-  // "Org-scoped non-admin" collapses all the "team member" behaviors
-  // (hidden edit, hidden cancel, no upgrade plans, pooled view, etc.).
-  // This includes members of `pro_*` orgs that aren't admins/owners.
+  // Non-admin org members see the "team member" view: no edit / no cancel
+  // / no upgrade, pooled usage display.
   const orgMemberOnly = isOrgScoped && !isTeamAdmin
   const orgAdminOrSolo = !isOrgScoped || isTeamAdmin
 
@@ -53,17 +52,9 @@ export function getSubscriptionPermissions(
     canUpgradeToTeam: isFree || (isPro && !isOrgScoped),
     canViewEnterprise: !isEnterprise && !orgMemberOnly,
     canManageTeam: isOrgScoped && isTeamAdmin && !isEnterprise,
-    // Edit the limit when: paid plan (not free, not enterprise) AND either
-    // personally-scoped or acting as an org admin/owner.
     canEditUsageLimit: (isFree || (isPaid && !isEnterprise)) && orgAdminOrSolo,
     canCancelSubscription: isPaid && !isEnterprise && orgAdminOrSolo,
     showTeamMemberView: orgMemberOnly,
-    // Personal Pro can upgrade to team/enterprise. Any org admin/owner on
-    // a non-enterprise plan can upgrade to enterprise — covers team admins
-    // AND admins of `pro_*` plans attached to an org (previously missed by
-    // the narrower `isTeam && isTeamAdmin` check, which left pro-on-org
-    // admins with no upgrade path even though `getVisiblePlans` listed
-    // enterprise for them).
     showUpgradePlans:
       (isFree || (isPro && !isOrgScoped) || (isOrgScoped && isTeamAdmin)) && !isEnterprise,
     isEnterpriseMember,
@@ -79,22 +70,13 @@ export function getVisiblePlans(
   const { isFree, isPro, isEnterprise, isOrgScoped } = subscription
   const { isTeamAdmin } = userRole
 
-  // Free users see all plans
   if (isFree) {
     plans.push('pro', 'team', 'enterprise')
-  }
-  // Personally-scoped Pro: can upgrade to team or enterprise
-  else if (isPro && !isOrgScoped) {
+  } else if (isPro && !isOrgScoped) {
     plans.push('team', 'enterprise')
-  }
-  // Org admin/owner on a non-enterprise plan: enterprise is the only
-  // remaining upgrade. Covers team admins and `pro_*`-on-org admins.
-  // Explicitly excludes enterprise admins (already on the top tier) so
-  // this stays consistent with `showUpgradePlans`.
-  else if (isOrgScoped && isTeamAdmin && !isEnterprise) {
+  } else if (isOrgScoped && isTeamAdmin && !isEnterprise) {
     plans.push('enterprise')
   }
-  // Org members, Enterprise users see no plans
 
   return plans
 }

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/usage-indicator/usage-indicator.tsx

@@ -335,20 +335,11 @@ export function UsageIndicator({ onClick }: UsageIndicatorProps) {
 
   const contextMenuItems = useMemo(
     () => ({
-      // Set limit: anyone who can manage billing on a paid non-enterprise
-      // plan. `userCanManageBilling` already enforces owner/admin for
-      // org-scoped subs (including `pro_*` attached to an org), so members
-      // of an org don't see this.
       showSetLimit: userCanManageBilling && !isFree && !isEnterprise,
-      // Upgrade to Pro: Only for free users
       showUpgradeToPro: isFree,
-      // Upgrade to Team: Free users and Pro users with billing permission
       showUpgradeToTeam: isFree || (isPro && userCanManageBilling),
-      // Manage seats: Only for Team admins
       showManageSeats: isTeam && userCanManageBilling,
-      // Upgrade to Enterprise: Only for Team admins (not free, not pro, not enterprise)
       showUpgradeToEnterprise: isTeam && userCanManageBilling,
-      // Contact support: Only for Enterprise admins
       showContactSupport: isEnterprise && userCanManageBilling,
       onSetLimit: handleSetLimit,
       onUpgradeToPro: handleUpgradeToPro,

apps/sim/lib/auth/auth.ts

@@ -2905,8 +2905,6 @@ export const auth = betterAuth({
                   )
                 }
 
-                // Persist the Stripe-resolved plan name to our DB row before
-                // any downstream work so subsequent reads see the fresh plan.
                 await syncSubscriptionPlan(subscription.id, subscription.plan, planFromStripe)
 
                 const subscriptionForOrg = {
@@ -2987,10 +2985,6 @@ export const auth = betterAuth({
                   )
                 }
 
-                // Sync the DB's `plan` column to whatever Stripe currently
-                // says. better-auth's upgrade flow updates Stripe price,
-                // seats, and referenceId, but historically left `plan`
-                // stale (see `pro_6000` attached to an org in prod).
                 await syncSubscriptionPlan(subscription.id, subscription.plan, planFromStripe)
 
                 const subscriptionForOrg = {

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

@@ -27,11 +27,9 @@ interface UsageData {
   currentUsage: number
   limit: number
   /**
-   * Whether the returned `currentUsage`/`limit` represent the user's
-   * individual slice (`'user'`) or the organization's pooled total and cap
-   * (`'organization'`). When `isExceeded` is driven by an org pool check,
-   * the pooled values are surfaced here so downstream error messages are
-   * accurate.
+   * Whether the returned values are this user's individual slice or the
+   * organization's pooled total/cap. When an org pool is the blocker,
+   * the pooled values are surfaced here so error messages reflect it.
    */
   scope: 'user' | 'organization'
   /** Present only when `scope === 'organization'`. */
@@ -47,9 +45,7 @@ export async function checkUsageStatus(
   preloadedSubscription?: HighestPrioritySubscription
 ): Promise<UsageData> {
   try {
-    // If billing is disabled, always return permissive limits
     if (!isBillingEnabled) {
-      // Get actual usage from the database for display purposes
       const statsRecords = await db.select().from(userStats).where(eq(userStats.userId, userId))
       const currentUsage =
         statsRecords.length > 0
@@ -67,20 +63,14 @@ export async function checkUsageStatus(
       }
     }
 
-    // Resolve the highest-priority subscription once so every branch below
-    // agrees on scope. The caller may have already loaded it.
     const sub =
       preloadedSubscription !== undefined
         ? preloadedSubscription
         : await getHighestPrioritySubscription(userId)
 
-    // Primary limit from user_stats or org (routed by scope).
     const limit = await getUserUsageLimit(userId, sub)
     logger.info('Using stored usage limit', { userId, limit })
 
-    // Usage baseline.
-    //   Org-scoped: pooled sum across all org members (with pooled refresh).
-    //   Personal:   user's own currentPeriodCost (with personal refresh).
     const subIsOrgScoped = isOrgScopedSubscription(sub, userId)
 
     let currentUsage = 0
@@ -114,15 +104,14 @@ export async function checkUsageStatus(
               periodStart: sub.periodStart,
               periodEnd: sub.periodEnd ?? null,
               planDollars,
-              seats: sub.seats ?? 1,
+              seats: sub.seats || 1,
             })
             pooled = Math.max(0, pooled - refresh)
           }
         }
       }
       currentUsage = pooled
     } else {
-      // Personally-scoped: use this user's own row (defensive default 0).
       const statsRecords = await db
         .select()
         .from(userStats)
@@ -161,24 +150,22 @@ export async function checkUsageStatus(
       currentUsage = Math.max(0, rawUsage - refresh)
     }
 
-    // Defense-in-depth: even when the user's priority sub is personal, they
-    // may still be a member of an org whose pool has blown its cap (e.g.
-    // billed-account scenarios). Enforce every entitled-org cap they belong
-    // to and override the returned values when one is actually blocking —
-    // that way the error message surfaces the org number, not personal.
+    // Defense-in-depth: enforce every entitled org cap the user belongs
+    // to, even when their priority sub is personal. If a secondary org
+    // pool is blocking, surface its numbers so the error message does
+    // not quote personal usage while enforcing an org cap.
     try {
       const memberships = await db
         .select({ organizationId: member.organizationId })
         .from(member)
         .where(eq(member.userId, userId))
 
       for (const m of memberships) {
-        // Skip the org the primary sub is already keyed to; we've already
-        // computed pooled usage against its cap above.
+        // Already handled above as the primary org.
         if (subIsOrgScoped && sub && sub.referenceId === m.organizationId) continue
 
-        // Pull the full org subscription row — refresh math below needs
-        // THAT org's plan/period/seats, not the caller's primary sub.
+        // Refresh math below needs THIS org's plan/period/seats, not
+        // the caller's primary sub (which may be a personal Pro).
         const [orgSub] = await db
           .select({
             plan: subscription.plan,
@@ -221,9 +208,6 @@ export async function checkUsageStatus(
           }
         }
 
-        // Refresh is driven by the org's OWN subscription period, plan
-        // dollars, and seats — not the caller's primary sub (which may be
-        // a personal Pro in this branch).
         if (isPaid(orgSub.plan) && orgSub.periodStart) {
           const planDollars = getPlanTierDollars(orgSub.plan)
           if (planDollars > 0) {
@@ -233,7 +217,7 @@ export async function checkUsageStatus(
               periodStart: orgSub.periodStart,
               periodEnd: orgSub.periodEnd ?? null,
               planDollars,
-              seats: orgSub.seats ?? 1,
+              seats: orgSub.seats || 1,
             })
             pooledUsage = Math.max(0, pooledUsage - orgRefreshDeduction)
           }
@@ -295,9 +279,9 @@ export async function checkUsageStatus(
     return {
       percentUsed: 100,
       isWarning: false,
-      isExceeded: true, // Block execution when we can't determine status
+      isExceeded: true,
       currentUsage: 0,
-      limit: 0, // Zero limit forces blocking
+      limit: 0,
       scope: 'user',
       organizationId: null,
     }
@@ -310,22 +294,19 @@ export async function checkUsageStatus(
  */
 export async function checkAndNotifyUsage(userId: string): Promise<void> {
   try {
-    // Skip usage notifications if billing is disabled
     if (!isBillingEnabled) {
       return
     }
 
     const usageData = await checkUsageStatus(userId)
 
     if (usageData.isExceeded) {
-      // User has exceeded their limit
       logger.warn('User has exceeded usage limits', {
         userId,
         usage: usageData.currentUsage,
         limit: usageData.limit,
       })
 
-      // Dispatch event to show a UI notification
       if (typeof window !== 'undefined') {
         window.dispatchEvent(
           new CustomEvent('usage-exceeded', {
@@ -334,15 +315,13 @@ export async function checkAndNotifyUsage(userId: string): Promise<void> {
         )
       }
     } else if (usageData.isWarning) {
-      // User is approaching their limit
       logger.info('User approaching usage limits', {
         userId,
         usage: usageData.currentUsage,
         limit: usageData.limit,
         percent: usageData.percentUsed,
       })
 
-      // Dispatch event to show a UI notification
       if (typeof window !== 'undefined') {
         window.dispatchEvent(
           new CustomEvent('usage-warning', {
@@ -383,7 +362,6 @@ export async function checkServerSideUsageLimits(
 
     logger.info('Server-side checking usage limits for user', { userId })
 
-    // Check user's own blocked status
     const stats = await db
       .select({
         blocked: userStats.billingBlocked,
@@ -413,14 +391,12 @@ export async function checkServerSideUsageLimits(
       }
     }
 
-    // Check if user is in an org where the owner is blocked
     const memberships = await db
       .select({ organizationId: member.organizationId })
       .from(member)
       .where(eq(member.userId, userId))
 
     for (const m of memberships) {
-      // Find the owner of this org
       const owners = await db
         .select({ userId: member.userId })
         .from(member)
@@ -479,9 +455,9 @@ export async function checkServerSideUsageLimits(
     })
 
     return {
-      isExceeded: true, // Block execution when we can't determine limits
+      isExceeded: true,
       currentUsage: 0,
-      limit: 0, // Zero limit forces blocking
+      limit: 0,
       message:
         error instanceof Error && error.message.includes('No user stats record found')
           ? 'User account not properly initialized. Please contact support.'

apps/sim/lib/billing/client/upgrade.ts

@@ -65,9 +65,6 @@ export function useSubscriptionUpgrade() {
           )
 
           if (existingOrg) {
-            // Check if this org already has ANY paid subscription — team,
-            // enterprise, or a `pro_*` that's been transferred to the org.
-            // Upgrading again would create a duplicate.
             const existingOrgSub = allSubscriptions.find(
               (sub: any) =>
                 hasPaidSubscriptionStatus(sub.status) &&