fix(billing): keep ended agreements queued until AWS agrees and bound each message

An Agreement Ended event can arrive before the entitlement read reflects the end, and deleting it
left the license current for up to a day, so the message now stays queued until AWS reports the
license ended. The run budget is checked before each message, since one ended agreement can read
many licenses, and messages not started stay queued for the next run. Removes a billing redirect
nothing uses any more, and stops one test depending on the order of same-transaction notices.

Author: waleedlatif1

apps/sim/app/workspace/page.tsx

@@ -132,9 +132,7 @@ export default function WorkspacePage() {
         ? buildUpgradeHref(id, isUpgradeReason(rawReason) ? rawReason : undefined)
         : redirectTarget === 'settings'
           ? `/workspace/${id}/settings/general`
-          : redirectTarget === 'billing'
-            ? `/workspace/${id}/settings/billing`
-            : `/workspace/${id}`
+          : `/workspace/${id}`
 
     const { workspaces, lastActiveWorkspaceId, creationPolicy, forwardOrganizationId } = data
 
@@ -143,11 +141,7 @@ export default function WorkspacePage() {
         hasRedirectedRef.current = true
         const routes = organizationRoutes(forwardOrganizationId)
         router.replace(
-          redirectTarget === 'settings'
-            ? routes.settingsSection('general')
-            : redirectTarget === 'billing'
-              ? routes.settingsSection('billing')
-              : routes.home
+          redirectTarget === 'settings' ? routes.settingsSection('general') : routes.home
         )
         return
       }

apps/sim/lib/billing/aws-marketplace/lifecycle.integration.ts

@@ -767,13 +767,16 @@ describe('linking a claimed license', () => {
       companyName: CONTACT.companyName,
     })
     const team = await emailsTo(TEAM)
-    expect(team.map((email) => email.subject)).toEqual([
-      expect.stringMatching(/active → active/),
-      expect.stringMatching(/Linked to an organization/),
-    ])
-    expect(team[1].text).toMatch(/Company: Example Co/)
-    expect(team[1].text).toMatch(/pausePaymentCollection: true/)
-    expect(team[1].text).toMatch(/Never send a Stripe invoice/)
+    expect(team.map((email) => email.subject)).toEqual(
+      expect.arrayContaining([
+        expect.stringMatching(/active → active/),
+        expect.stringMatching(/Linked to an organization/),
+      ])
+    )
+    const linkNotice = team.find((email) => /Linked to an organization/.test(email.subject))
+    expect(linkNotice?.text).toMatch(/Company: Example Co/)
+    expect(linkNotice?.text).toMatch(/pausePaymentCollection: true/)
+    expect(linkNotice?.text).toMatch(/Never send a Stripe invoice/)
     expect(await emailsTo(BUYER)).toEqual([
       expect.objectContaining({
         text: expect.stringMatching(
@@ -1307,6 +1310,35 @@ describe('reconcileAwsMarketplaceLicenses', () => {
     }
   })
 
+  it('leaves messages it has not started queued once the run budget cannot fit another', async () => {
+    vi.useFakeTimers({ toFake: ['Date'] })
+    try {
+      const licenses = await Promise.all([insertLicense(), insertLicense()])
+      for (const { licenseArn } of licenses) {
+        entitlementsByLicense.set(licenseArn, [currentEntitlement()])
+      }
+      const deleted = deliverOnce(
+        licenses.map(({ licenseArn }) => ({
+          'detail-type': 'License Updated - Manufacturer',
+          detail: { license: { arn: licenseArn }, product: { code: PRODUCT } },
+        }))
+      )
+      const receive = queueSend.getMockImplementation()
+      queueSend.mockImplementation(async (command: { kind: string }) => {
+        const answer = await receive?.(command)
+        if (command.kind === 'receive') vi.setSystemTime(Date.now() + 6 * 60_000)
+        return answer
+      })
+
+      const summary = await reconcileAwsMarketplaceLicenses()
+
+      expect(summary).toMatchObject({ received: 0, outOfBudget: true })
+      expect(deleted).toEqual([])
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('keeps licenses AWS keeps refusing from starving the rest of the re-verify', async () => {
     const failing = Array.from({ length: 50 }, () => uniqueArn())
     const healthyArn = uniqueArn()
@@ -1370,6 +1402,21 @@ describe('agreement events', () => {
     ])
   })
 
+  it('keeps an ended agreement queued while AWS still reports its license current', async () => {
+    const agreementId = uniqueAgreement()
+    const { licenseArn } = await insertLicense({ agreementId })
+    entitlementsByLicense.set(licenseArn, [currentEntitlement()])
+    const deleted = deliverOnce([
+      {
+        'detail-type': 'Purchase Agreement Ended - Proposer',
+        detail: { agreement: { id: agreementId } },
+      },
+    ])
+
+    expect(await reconcileAwsMarketplaceLicenses()).toMatchObject({ retained: 1, applied: 0 })
+    expect(deleted).toEqual([])
+  })
+
   it('reads every license of an ended agreement even when one fails, and keeps the message', async () => {
     const agreementId = uniqueAgreement()
     const failing = await insertLicense({ agreementId, lastVerificationAttemptAt: new Date(0) })

apps/sim/lib/billing/aws-marketplace/reconcile.ts

@@ -210,9 +210,9 @@ async function extendVisibility(
 
 /**
  * Each license gets its own read bound and commits on its own, so one that fails or runs out of
- * time costs no other's progress. The message stays queued until all of them have been read, and
- * a redelivery starts with those least recently attempted. An agreement ID with no license is
- * normal: the seller account has other products.
+ * time costs no other's progress. The message stays queued until AWS reports all of them ended,
+ * since a read can lag the event, and a redelivery starts with those least recently attempted. An
+ * agreement ID with no license is normal: the seller account has other products.
  */
 async function applyAgreementEnded(
   context: DrainContext,
@@ -233,7 +233,11 @@ async function applyAgreementEnded(
     }
     if (index > 0) await extendVisibility(context, message, messageId)
     try {
-      await reverifyLicense(context.productCode, licenseArn, { ended: true })
+      const { summary } = await reverifyLicense(context.productCode, licenseArn, { ended: true })
+      if (summary.active) {
+        incomplete = true
+        logger.info('AWS still reports a license of an ended agreement current', { messageId })
+      }
     } catch (error) {
       if (isInvalidEntitlementRequest(error)) {
         logger.warn('The Entitlement Service rejected a license of an ended agreement', {
@@ -384,6 +388,11 @@ async function drainEvents(context: DrainContext): Promise<void> {
     if (messages.length === 0) return
 
     for (const message of messages) {
+      // An ended agreement can read many licenses; what is not started stays queued for the next run.
+      if (!fits(LICENSE_READ_BUDGET_MS)) {
+        summary.outOfBudget = true
+        return
+      }
       summary.received++
       const outcome = await handleMessage(context, message)
       summary[outcome]++

apps/sim/lib/navigation/paths.ts

@@ -25,9 +25,6 @@ export const WORKSPACES_PATH = '/workspace'
 /** Opens full settings in the viewer's most recent accessible workspace. */
 export const WORKSPACE_SETTINGS_PATH = `${WORKSPACES_PATH}?redirect=settings`
 
-/** Opens billing settings in the viewer's most recent accessible workspace. */
-export const WORKSPACE_BILLING_PATH = `${WORKSPACES_PATH}?redirect=billing`
-
 /** Root of the organization surface; `/o` alone resolves like {@link APP_ENTRY_PATH}. */
 const ORGANIZATIONS_PATH = '/o'