fix(billing): recommit the in-flight value, include the plan in seat convergence, bound the reconcile's outbox reads

Author: waleedlatif1

apps/sim/lib/admin/subscription-lifecycle.ts

@@ -11,7 +11,7 @@ import { OUTBOX_EVENT_TYPES } from '@/lib/billing/webhooks/outbox-events'
 import {
   enqueueCancelAtPeriodEndSync,
   lockSubscriptionForSyncRetry,
-  recommitSubscriptionSync,
+  recordCancelAtPeriodEnd,
 } from '@/lib/billing/webhooks/subscription-sync'
 import { enqueueOutboxEvent } from '@/lib/core/outbox/service'
 
@@ -338,11 +338,7 @@ export async function requestDashboardSubscriptionCancellation({
             and(eq(outboxEvent.id, existingOperation.id), eq(outboxEvent.status, 'dead_letter'))
           )
         if (existingOperation.eventType === OUTBOX_EVENT_TYPES.STRIPE_SYNC_CANCEL_AT_PERIOD_END) {
-          await recommitSubscriptionSync(
-            tx,
-            OUTBOX_EVENT_TYPES.STRIPE_SYNC_CANCEL_AT_PERIOD_END,
-            existingOperation.subscriptionId
-          )
+          await recordCancelAtPeriodEnd(tx, existingOperation.subscriptionId, true)
         }
         return {
           operationId,

apps/sim/lib/billing/organizations/provision-seat.test.ts

@@ -55,7 +55,7 @@ const mockGetHighestPriorityPersonalSubscription =
 
 /** The subscription row as the activation re-reads it under its lock. */
 function testExecutor(onSubscriptionLock: () => void = () => {}) {
-  const lockedRow = { cancelAtPeriodEnd: false, seats: 1 }
+  const lockedRow = { cancelAtPeriodEnd: false, seats: 1, stripeSubscriptionId: 'stripe_sub' }
   return {
     select: () => ({
       from: () => ({

apps/sim/lib/billing/organizations/provision-seat.ts

@@ -243,7 +243,7 @@ async function convertPersonalSubscriptionToTeam(
  * the caller's earlier read is still cleared and recorded.
  */
 async function activateTeamSubscription(
-  sub: { id: string; stripeSubscriptionId: string | null },
+  sub: { id: string },
   targetPlan: string,
   { planChanged }: { planChanged: boolean },
   tx: DbOrTx
@@ -252,6 +252,7 @@ async function activateTeamSubscription(
     .select({
       cancelAtPeriodEnd: subscriptionTable.cancelAtPeriodEnd,
       seats: subscriptionTable.seats,
+      stripeSubscriptionId: subscriptionTable.stripeSubscriptionId,
     })
     .from(subscriptionTable)
     .where(eq(subscriptionTable.id, sub.id))
@@ -271,10 +272,10 @@ async function activateTeamSubscription(
     })
   }
 
-  if (!sub.stripeSubscriptionId) return
-  if (locked?.cancelAtPeriodEnd) {
+  if (!locked?.stripeSubscriptionId) return
+  if (locked.cancelAtPeriodEnd) {
     await enqueueCancelAtPeriodEndSync(tx, {
-      stripeSubscriptionId: sub.stripeSubscriptionId,
+      stripeSubscriptionId: locked.stripeSubscriptionId,
       subscriptionId: sub.id,
       cancelAtPeriodEnd: false,
       reason: 'pro-to-team-conversion',

apps/sim/lib/billing/webhooks/outbox-handlers.ts

@@ -299,11 +299,13 @@ const stripeSyncSubscriptionSeats: OutboxHandler<SubscriptionSeatsSyncPayload> =
 
     const latest = await getSubscriptionSeatSyncState(payload.subscriptionId)
     const latestSeats = (await readRecordedSyncValue(ctx.eventId))?.seats ?? (latest?.seats || 1)
-    if (latestSeats !== desiredSeats) {
-      logger.info('Subscription seats changed during Stripe sync; retrying latest value', {
+    if (latestSeats !== desiredSeats || latest?.plan !== row.plan) {
+      logger.info('Subscription plan or seats changed during Stripe sync; retrying latest', {
         eventId: ctx.eventId,
         subscriptionId: payload.subscriptionId,
         stripeSubscriptionId: row.stripeSubscriptionId,
+        attemptedPlan: row.plan,
+        latestPlan: latest?.plan,
         attemptedSeats: desiredSeats,
         latestSeats,
         attempt,
@@ -323,7 +325,7 @@ const stripeSyncSubscriptionSeats: OutboxHandler<SubscriptionSeatsSyncPayload> =
     return
   }
 
-  throw new Error(`Subscription seats changed while syncing ${payload.subscriptionId}`)
+  throw new Error(`Subscription plan or seats changed while syncing ${payload.subscriptionId}`)
 }
 
 const stripeThresholdOverageInvoice: OutboxHandler<StripeThresholdOverageInvoicePayload> = async (