fix(enterprise): keep owner activation recoverable

Author: icecrasher321

apps/sim/app/api/v1/admin/dashboard/enterprise-owner-claims/route.ts

@@ -8,7 +8,7 @@ import { parseRequest } from '@/lib/api/server'
 import { dollarsToCredits } from '@/lib/billing/credits/conversion'
 import {
   createEnterpriseOwnerClaim,
-  getPendingEnterpriseOwnerClaimsPage,
+  getOpenEnterpriseOwnerClaimsPage,
 } from '@/lib/billing/enterprise-owner-claim'
 import { EnterpriseProvisioningError } from '@/lib/billing/enterprise-provisioning'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -36,7 +36,7 @@ export const GET = withRouteHandler(
     if (!parsed.success) return parsed.response
     try {
       const { limit, offset } = parsed.data.query
-      const result = await getPendingEnterpriseOwnerClaimsPage({ limit, offset })
+      const result = await getOpenEnterpriseOwnerClaimsPage({ limit, offset })
       return listResponse(result.data, {
         total: result.total,
         limit,

apps/sim/lib/billing/enterprise-owner-claim.test.ts

@@ -77,6 +77,7 @@ import {
   acceptEnterpriseOwnerClaim,
   enterpriseOwnerClaimOutboxHandlers,
   getEnterpriseOwnerClaimDetails,
+  retryEnterpriseOwnerClaim,
   reviewEnterpriseOwnerClaim,
   revokeEnterpriseOwnerClaim,
 } from '@/lib/billing/enterprise-owner-claim'
@@ -372,4 +373,36 @@ describe('Enterprise future-owner claims', () => {
     expect(mocks.createOrganization).not.toHaveBeenCalled()
     expect(mocks.enqueue).not.toHaveBeenCalled()
   })
+
+  it('repairs the parent claim when activation already attached provisioning', async () => {
+    const accepted = {
+      acceptedAt: '2026-08-20T12:00:00.000Z',
+      ownerUserId: 'owner-1',
+      organizationId: 'org-1',
+      workspaceIds: ['workspace-1'],
+      reportingPeriodAnchorDate: '2026-08-20',
+      activationEventId: 'activation-1',
+      createdDefaultWorkspaceId: null,
+    }
+    const acceptedPayload = { ...claimPayload(), acceptance: accepted }
+    const activationRow = {
+      ...claimRow({ claimId: 'claim-1', provisioningOperationId: 'provisioning-1' }),
+      id: 'activation-1',
+      eventType: 'enterprise.activate-owner-claim',
+    }
+    queueTableRows(outboxEvent, [claimRow(acceptedPayload)])
+    queueTableRows(outboxEvent, [activationRow])
+    queueTableRows(outboxEvent, [
+      claimRow({ ...acceptedPayload, provisioningOperationId: 'provisioning-1' }),
+    ])
+    queueTableRows(outboxEvent, [activationRow])
+
+    const result = await retryEnterpriseOwnerClaim('claim-1')
+
+    expect(result).toMatchObject({ status: 'applied', provisioningOperationId: 'provisioning-1' })
+    expect(mocks.patchPayload).toHaveBeenCalledWith(expect.anything(), 'claim-1', {
+      provisioningOperationId: 'provisioning-1',
+    })
+    expect(mocks.issueProvisioning).not.toHaveBeenCalled()
+  })
 })

apps/sim/lib/billing/enterprise-owner-claim.ts

@@ -448,21 +448,25 @@ export async function getEnterpriseOwnerClaimView(
   return toClaimView(row, payload)
 }
 
-export async function getPendingEnterpriseOwnerClaimsPage(params: {
+export async function getOpenEnterpriseOwnerClaimsPage(params: {
   limit: number
   offset: number
 }): Promise<{ data: EnterpriseOwnerClaimView[]; total: number }> {
-  const unacceptedClaim = and(
+  const openClaim = and(
     eq(outboxEvent.eventType, ENTERPRISE_OWNER_CLAIM_EVENT_TYPE),
-    sql`${outboxEvent.payload} -> 'acceptance' is null`,
-    sql`${outboxEvent.payload} -> 'revokedAt' is null`
+    sql`${outboxEvent.payload} -> 'revokedAt' is null`,
+    sql`${outboxEvent.payload} -> 'provisioningOperationId' is null`,
+    or(
+      sql`${outboxEvent.payload} -> 'acceptance' is not null`,
+      sql`(${outboxEvent.payload} ->> 'expiresAt')::timestamptz > now()`
+    )
   )
   const [countRows, rows] = await Promise.all([
-    db.select({ value: count() }).from(outboxEvent).where(unacceptedClaim),
+    db.select({ value: count() }).from(outboxEvent).where(openClaim),
     db
       .select()
       .from(outboxEvent)
-      .where(unacceptedClaim)
+      .where(openClaim)
       .orderBy(desc(outboxEvent.createdAt), desc(outboxEvent.id))
       .limit(params.limit)
       .offset(params.offset),
@@ -646,6 +650,9 @@ export async function retryEnterpriseOwnerClaim(
       throw new Error('Enterprise owner activation payload is invalid')
     provisioningOperationId =
       payload.provisioningOperationId ?? activationPayload.data.provisioningOperationId ?? null
+    if (!payload.provisioningOperationId && provisioningOperationId) {
+      await patchOutboxEventPayload(tx, claimId, { provisioningOperationId })
+    }
     if (activationRow.status === 'dead_letter') {
       await resetOutboxEventForRetry(tx, activationRow.id)
       eventIdToProcess = activationRow.id