feat(webapp): billing limits — pause, reject, recovery, and settings UI by kathiekiwi · Pull Request #3996 · triggerdotdev/trigger.dev

kathiekiwi · 2026-06-19T13:09:43Z

Summary

Adds Billing Limits to the webapp.

Customers can set a monthly spend cap. When usage crosses the limit, billable environments enter a grace period. If the limit is not resolved before grace expires, new triggers are rejected until the organization increases or removes the limit.

The webapp consumes billing-limit state from the billing platform and enforces it across environments, queues, and trigger creation.

Depends on the matching cloud billing PR.

User-facing changes

Billing Limits settings

New /settings/billing-limits page replaces the standalone billing-alerts page.
Configure:
- plan limit
- custom limit
- no limit
Configure billing alerts and notification emails.
Resolve active billing limits by increasing or removing the limit.

Org-wide banners

Adds banners for:

grace period
rejected state
billing limits not configured
upgrade prompts

Usage page

Shows the configured billing limit on the spend chart.

Enforcement

Billable environments are paused when an org enters grace.
New triggers are rejected once grace expires.
Billing-limit pauses cannot be manually resumed.
New environments created during grace/rejected inherit the correct paused state.
Recovery supports:
- resuming queued runs
- cancelling queued runs and starting fresh
- optional cancellation of in-progress runs when a limit is reached

Infrastructure

Adds billing-limit workers and reconciliation.
Adds admin endpoints used by the billing platform.
Adds BILLING_LIMIT as an environment pause source.

Test plan

Configure limits, alerts, and emails.
Verify grace and rejected flows.
Verify trigger rejection after grace expiry.
Verify recovery flows (queue and new_only).
Verify new environments created during grace start paused.
Verify billing-limit pauses cannot be manually resumed.
Verify billing limit marker on the usage chart.

Notes

isConfigured: false means no billing limit has been configured yet.
mode: "none" means the customer explicitly opted out.
Grace pauses execution but still accepts triggers.
Rejected blocks new triggers.

changeset-bot · 2026-06-19T13:09:48Z

⚠️ No Changeset found

Latest commit: 4ac82e5

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

coderabbitai · 2026-06-19T13:10:03Z

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

@coderabbitai resume to resume automatic reviews.
@coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

▶️ Resume reviews
🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 9f284155-afc0-48be-80c9-792a49ba3742

📥 Commits

Reviewing files that changed from the base of the PR and between c1935f8 and 4ac82e5.

📒 Files selected for processing (89)

.server-changes/billing-limits.md
apps/webapp/app/components/billing/AnimatedOrgBannerBar.tsx
apps/webapp/app/components/billing/BillingAlertsSection.tsx
apps/webapp/app/components/billing/BillingLimitConfigSection.tsx
apps/webapp/app/components/billing/BillingLimitRecoveryPanel.tsx
apps/webapp/app/components/billing/BillingLimitResolveProgress.tsx
apps/webapp/app/components/billing/OrgBanner.tsx
apps/webapp/app/components/billing/UpgradePrompt.tsx
apps/webapp/app/components/billing/billingAlertsFormat.ts
apps/webapp/app/components/billing/billingLimitFormat.ts
apps/webapp/app/components/billing/selectOrgBanner.ts
apps/webapp/app/components/layout/AppLayout.tsx
apps/webapp/app/components/navigation/EnvironmentBanner.tsx
apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
apps/webapp/app/components/primitives/AnimatedCallout.tsx
apps/webapp/app/components/primitives/PageHeader.tsx
apps/webapp/app/entry.server.tsx
apps/webapp/app/env.server.ts
apps/webapp/app/hooks/useOrganizations.ts
apps/webapp/app/hooks/useScrollContainerToTop.ts
apps/webapp/app/models/organization.server.ts
apps/webapp/app/presenters/OrganizationsPresenter.server.ts
apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-limits/billingLimitsRevalidation.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-limits/billingLimitsRoute.server.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-limits/route.tsx
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
apps/webapp/app/routes/_app.orgs.$organizationSlug/route.tsx
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.billing-limit.hit.ts
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.billing-limit.reject.ts
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.billing-limit.resolve.ts
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.runs.enable.ts
apps/webapp/app/routes/storybook.callout/route.tsx
apps/webapp/app/runEngine/validators/triggerTaskValidator.ts
apps/webapp/app/runEngine/validators/validateProductionEntitlement.server.ts
apps/webapp/app/services/billingLimit.schemas.ts
apps/webapp/app/services/platform.v3.server.ts
apps/webapp/app/services/routeBuilders/permissions.server.ts
apps/webapp/app/services/upsertBranch.server.ts
apps/webapp/app/utils/environmentPauseSource.ts
apps/webapp/app/utils/pathBuilder.ts
apps/webapp/app/v3/billingLimitWorker.server.ts
apps/webapp/app/v3/outOfEntitlementError.server.ts
apps/webapp/app/v3/services/billingLimit/BillingLimitBulkCancelService.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitCancelInProgressRuns.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitConstants.ts
apps/webapp/app/v3/services/billingLimit/billingLimitConvergeEnvironments.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitConvergeEnvironmentsService.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitConvergeResolve.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitHit.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitPendingResolve.types.ts
apps/webapp/app/v3/services/billingLimit/billingLimitPendingResolveCoordinator.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitPendingResolveFailure.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitQueuedRuns.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitReconcileQueue.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitReconcileTarget.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitReconciliation.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitResolve.server.ts
apps/webapp/app/v3/services/billingLimit/getBillingLimitQueuedRunCount.server.ts
apps/webapp/app/v3/services/billingLimit/getInitialEnvPauseStateForBillingLimit.server.ts
apps/webapp/app/v3/services/billingLimit/manualPauseEnvironmentGuard.server.ts
apps/webapp/app/v3/services/billingLimit/runBillingLimitReconcileTick.server.ts
apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts
apps/webapp/app/v3/services/pauseEnvironment.server.ts
apps/webapp/app/v3/services/triggerTask.server.ts
apps/webapp/server.ts
apps/webapp/test/billingAlertsFormat.test.ts
apps/webapp/test/billingLimit.schemas.test.ts
apps/webapp/test/billingLimitBulkCancelInProgress.test.ts
apps/webapp/test/billingLimitConvergeEnvironments.test.ts
apps/webapp/test/billingLimitConvergeEnvironmentsService.test.ts
apps/webapp/test/billingLimitConvergeResolve.test.ts
apps/webapp/test/billingLimitEnvCreatePause.test.ts
apps/webapp/test/billingLimitHit.test.ts
apps/webapp/test/billingLimitPauseEnvironment.test.ts
apps/webapp/test/billingLimitQueuedRuns.test.ts
apps/webapp/test/billingLimitReconcileTick.test.ts
apps/webapp/test/billingLimitReconciliation.test.ts
apps/webapp/test/billingLimitResolve.test.ts
apps/webapp/test/billingLimitTriggerEntitlement.test.ts
apps/webapp/test/billingLimitsRoute.test.ts
apps/webapp/test/orgBanner.test.ts
docs/how-to-reduce-your-spend.mdx
internal-packages/database/prisma/migrations/20260614120000_add_environment_pause_source_billing_limit/migration.sql
internal-packages/database/prisma/migrations/20260626120000_bulk_action_group_dedupe_key_column/migration.sql
internal-packages/database/prisma/migrations/20260626120001_bulk_action_group_dedupe_key_index/migration.sql
internal-packages/database/prisma/schema.prisma

💤 Files with no reviewable changes (2)

apps/webapp/app/components/billing/UpgradePrompt.tsx
apps/webapp/app/components/navigation/EnvironmentBanner.tsx

✅ Files skipped from review due to trivial changes (5)

internal-packages/database/prisma/migrations/20260626120000_bulk_action_group_dedupe_key_column/migration.sql
apps/webapp/app/hooks/useScrollContainerToTop.ts
apps/webapp/app/utils/environmentPauseSource.ts
apps/webapp/test/billingLimitTriggerEntitlement.test.ts
apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts

🚧 Files skipped from review as they are similar to previous changes (81)

apps/webapp/app/components/billing/BillingLimitResolveProgress.tsx
apps/webapp/app/v3/outOfEntitlementError.server.ts
apps/webapp/app/services/routeBuilders/permissions.server.ts
apps/webapp/app/v3/services/triggerTask.server.ts
apps/webapp/test/billingLimitQueuedRuns.test.ts
apps/webapp/app/v3/services/billingLimit/billingLimitCancelInProgressRuns.server.ts
apps/webapp/test/billingLimitEnvCreatePause.test.ts
apps/webapp/test/orgBanner.test.ts
apps/webapp/test/billingLimitPauseEnvironment.test.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-limits/billingLimitsRevalidation.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
apps/webapp/app/components/billing/billingLimitFormat.ts
apps/webapp/app/v3/services/billingLimit/billingLimitReconcileQueue.server.ts
apps/webapp/test/billingLimitConvergeResolve.test.ts
apps/webapp/app/v3/services/billingLimit/getBillingLimitQueuedRunCount.server.ts
internal-packages/database/prisma/migrations/20260614120000_add_environment_pause_source_billing_limit/migration.sql
apps/webapp/app/v3/services/billingLimit/manualPauseEnvironmentGuard.server.ts
internal-packages/database/prisma/migrations/20260626120001_bulk_action_group_dedupe_key_index/migration.sql
apps/webapp/app/runEngine/validators/validateProductionEntitlement.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitConvergeEnvironmentsService.server.ts
apps/webapp/server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitPendingResolve.types.ts
apps/webapp/app/components/billing/selectOrgBanner.ts
apps/webapp/app/v3/services/billingLimit/billingLimitReconcileTarget.server.ts
apps/webapp/app/presenters/OrganizationsPresenter.server.ts
apps/webapp/app/entry.server.tsx
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.billing-limit.hit.ts
apps/webapp/test/billingLimitReconciliation.test.ts
apps/webapp/test/billingLimitConvergeEnvironmentsService.test.ts
apps/webapp/app/v3/services/billingLimit/billingLimitHit.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitPendingResolveCoordinator.server.ts
apps/webapp/app/hooks/useOrganizations.ts
apps/webapp/app/components/layout/AppLayout.tsx
apps/webapp/app/v3/services/billingLimit/billingLimitConvergeResolve.server.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug/route.tsx
apps/webapp/app/services/upsertBranch.server.ts
apps/webapp/test/billingLimit.schemas.test.ts
apps/webapp/app/v3/services/billingLimit/billingLimitResolve.server.ts
apps/webapp/app/utils/pathBuilder.ts
apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-limits/billingLimitsRoute.server.ts
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.billing-limit.reject.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
apps/webapp/app/v3/services/billingLimit/billingLimitPendingResolveFailure.server.ts
apps/webapp/app/routes/storybook.callout/route.tsx
apps/webapp/app/runEngine/validators/triggerTaskValidator.ts
apps/webapp/test/billingLimitResolve.test.ts
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.billing-limit.resolve.ts
apps/webapp/app/v3/services/billingLimit/billingLimitQueuedRuns.server.ts
apps/webapp/app/components/billing/OrgBanner.tsx
apps/webapp/app/components/billing/BillingAlertsSection.tsx
apps/webapp/app/v3/services/billingLimit/billingLimitConvergeEnvironments.server.ts
apps/webapp/test/billingLimitConvergeEnvironments.test.ts
apps/webapp/test/billingLimitReconcileTick.test.ts
docs/how-to-reduce-your-spend.mdx
apps/webapp/app/v3/services/billingLimit/getInitialEnvPauseStateForBillingLimit.server.ts
apps/webapp/app/components/primitives/PageHeader.tsx
apps/webapp/app/v3/services/billingLimit/billingLimitConstants.ts
apps/webapp/test/billingLimitHit.test.ts
apps/webapp/app/models/organization.server.ts
internal-packages/database/prisma/schema.prisma
apps/webapp/app/components/billing/AnimatedOrgBannerBar.tsx
apps/webapp/app/services/billingLimit.schemas.ts
apps/webapp/test/billingLimitsRoute.test.ts
apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.runs.enable.ts
apps/webapp/app/v3/services/pauseEnvironment.server.ts
apps/webapp/app/v3/billingLimitWorker.server.ts
apps/webapp/test/billingLimitBulkCancelInProgress.test.ts
apps/webapp/app/env.server.ts
apps/webapp/app/components/billing/BillingLimitConfigSection.tsx
apps/webapp/app/v3/services/billingLimit/runBillingLimitReconcileTick.server.ts
apps/webapp/app/v3/services/billingLimit/BillingLimitBulkCancelService.server.ts
apps/webapp/app/components/primitives/AnimatedCallout.tsx
apps/webapp/app/components/billing/billingAlertsFormat.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts
apps/webapp/app/v3/services/billingLimit/billingLimitReconciliation.server.ts
apps/webapp/app/components/billing/BillingLimitRecoveryPanel.tsx
apps/webapp/app/services/platform.v3.server.ts
apps/webapp/test/billingAlertsFormat.test.ts
apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-limits/route.tsx

📜 Recent review details

⏰ Context from checks skipped due to timeout. (25)

GitHub Check: internal / 🧪 Unit Tests: Internal (1, 12)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (2, 10)
GitHub Check: internal / 🧪 Unit Tests: Internal (9, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (12, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (11, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (7, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (4, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (8, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (6, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (3, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (5, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (10, 12)
GitHub Check: internal / 🧪 Unit Tests: Internal (2, 12)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (7, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (10, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (9, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (8, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (1, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (5, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (6, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (4, 10)
GitHub Check: webapp / 🧪 Unit Tests: Webapp (3, 10)
GitHub Check: typecheck / typecheck
GitHub Check: e2e-webapp / 🧪 E2E Tests: Webapp
GitHub Check: 🛡️ E2E Auth Tests (full)

🧰 Additional context used

🧠 Learnings (1)

📚 Learning: 2026-05-14T14:54:39.095Z

Learnt from: ericallam
Repo: triggerdotdev/trigger.dev PR: 3545
File: .server-changes/agent-view-sessions.md:10-10
Timestamp: 2026-05-14T14:54:39.095Z
Learning: In the `trigger.dev` repository, do not flag inconsistent dot vs slash notation in route/path strings inside `.server-changes/*.md` files. These markdown files are consumed verbatim into the changelog, so the mixed notation (e.g., `resources.orgs.../runs.$runParam/...`) is intentional and should be preserved as-is.

Applied to files:

.server-changes/billing-limits.md

🪛 LanguageTool

.server-changes/billing-limits.md

[grammar] ~9-~9: Ensure spelling is correct
Context: ...ueued backlog. Reconciliation keeps the webapp converged to billing's state. ## Manua...

(QB_NEW_EN_ORTHOGRAPHY_ERROR_IDS_1)

🔇 Additional comments (1)

.server-changes/billing-limits.md (1)

1-25: LGTM!

Walkthrough

This PR adds billing-limit data contracts, platform and worker support, pause-source-aware environment handling, a billing-limits settings page, and related tests and docs. It introduces new schemas and API helpers for billing limits and entitlements, a Redis-backed worker with reconcile and resolve orchestration, pause/resume logic keyed by pauseSource, admin webhook routes for billing-limit events, and UI components for configuring limits, alerts, recovery, and banners. The old billing-alerts settings route now redirects to billing-limits, and billing-limit-related data is wired into org loaders, usage display, and navigation.

🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (2 warnings)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The description is detailed, but it does not follow the required template sections like Closes #, checklist, Testing, Changelog, or Screenshots.	Add the template sections: Closes #, checklist items, testing steps, a short changelog, and screenshots if applicable.
Docstring Coverage	⚠️ Warning	Docstring coverage is 21.92% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title is clear, specific, and matches the pull request’s main billing-limits changes.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch feature/billing-limits

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

pkg-pr-new · 2026-06-22T09:08:33Z

Open in StackBlitz

@trigger.dev/build

npm i https://pkg.pr.new/@trigger.dev/build@8a5d58d

trigger.dev

npm i https://pkg.pr.new/trigger.dev@8a5d58d

@trigger.dev/core

npm i https://pkg.pr.new/@trigger.dev/core@8a5d58d

@trigger.dev/python

npm i https://pkg.pr.new/@trigger.dev/python@8a5d58d

@trigger.dev/react-hooks

npm i https://pkg.pr.new/@trigger.dev/react-hooks@8a5d58d

@trigger.dev/redis-worker

npm i https://pkg.pr.new/@trigger.dev/redis-worker@8a5d58d

@trigger.dev/rsc

npm i https://pkg.pr.new/@trigger.dev/rsc@8a5d58d

@trigger.dev/schema-to-json

npm i https://pkg.pr.new/@trigger.dev/schema-to-json@8a5d58d

@trigger.dev/sdk

npm i https://pkg.pr.new/@trigger.dev/sdk@8a5d58d

commit: 8a5d58d

Adds billing limit enforcement: pause/reject when a limit is hit, recovery and resolve flows, bulk-cancel of queued/in-progress runs, the settings + usage UI, and the supporting schema, worker, and reconciliation services.