improvement(checkout): enforce team/enterprise-only org subscription, block double-covered personal checkouts

[icecrasher321]

Summary

Enforce team/enterprise-only org subscription, block double-covered personal checkouts and drop renewal-triggered workspace detach

Type of Change

• Bug fix

Testing

Tested manually

Checklist

• Code follows project style guidelines
• Self-reviewed my changes
• Tests added/updated and passing
• No new warnings introduced
• I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
docs	Skipped		Jul 17, 2026 1:48am

[cursor]

PR Summary

High Risk
Changes touch auth middleware, Stripe adapter writes, checkout authorization, and webhook subscription lifecycle paths where incorrect gating could block legitimate billing or allow double billing.

Overview
Tightens billing invariants so organization subscriptions only ever hold Team or Enterprise plans, and users already covered by a paid org cannot start a personal checkout.

Checkout and auth hooks now block personal /subscription/upgrade when org coverage applies (assertPersonalCheckoutAllowed), and org checkouts reject non–team/enterprise plans, duplicate org subs, and unresolved Enterprise issuance via explicit APIErrors instead of silent false. The Better Auth DB adapter is wrapped with guardSubscriptionPlanWrites so Stripe plugin writes cannot persist a personal plan on an org-referenced row before webhooks run; syncSubscriptionPlan applies the same rule in callbacks and returns the effective DB plan for downstream webhook logic.

On personal Pro completion, pauseProSubscriptionForOrgCoverage closes the race where checkout finishes after the user joined a paid org—pausing renewal and skipping handleSubscriptionCreated when covered so usage is not reset incorrectly. Team subs still re-home onto the admin’s org under lock in ensureOrganizationForTeamSubscription.

handleOrganizationPlanDowngrade is removed from subscription update handling so plan/price changes no longer detach workspaces; dormancy/detach is documented as subscription deletion only, with bulk recordAuditBatch on workspace detach.

^{Reviewed by Cursor Bugbot for commit 37eb50d. Configure here.}

[greptile-apps]

Greptile Summary

This PR tightens checkout and subscription handling for personal and organization plans. The main changes are:

• Restricts organization subscriptions to Team and Enterprise plans.
• Blocks personal checkout when an organization already covers the user.
• Pauses personal Pro subscriptions created during an organization-coverage race.
• Removes workspace detachment from plan-downgrade updates.
• Adds batched audit records for workspace detachment.

Confidence Score: 5/5

This looks safe to merge.

• The updated write guard preserves the intended organization plan in both adapter and callback paths.
• Downstream subscription processing uses the persisted plan instead of the rejected Stripe plan.
• No distinct blocking issue remains within the scope of this follow-up.

Important Files Changed

Filename	Overview
apps/sim/lib/auth/auth.ts	Integrates personal checkout checks, guarded subscription writes, effective-plan handling, and checkout-race cleanup.
apps/sim/lib/auth/stripe-adapter-guard.ts	Prevents non-organization plans from being stored on organization-referenced subscriptions.
apps/sim/lib/billing/authorization.ts	Adds plan and duplicate-coverage checks for personal and organization checkout requests.
apps/sim/lib/billing/core/subscription.ts	Returns the persisted effective plan after synchronization and adds organization coverage lookup.
apps/sim/lib/billing/organization.ts	Strengthens Team and Enterprise subscription re-homing with locked membership and plan checks.
apps/sim/lib/billing/organizations/membership.ts	Adds transactional pausing for personal Pro subscriptions created while organization coverage exists.
packages/audit/src/log.ts	Adds chunked batch insertion for audit records.

_{Reviews (4): Last reviewed commit: "fix(billing): compute org coverage indep..." | Re-trigger Greptile}

[icecrasher321]

bugbot run

[icecrasher321]

@greptile

[icecrasher321]

bugbot run

[icecrasher321]

@greptile

[icecrasher321]

bugbot run

[icecrasher321]

@greptile

[cursor]

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 37eb50d. Configure here.}