fix: protect personal organization billing credits by saurya · Pull Request #167 · OpenHands/enterprise

saurya · 2026-08-12T01:05:02Z

Summary

preserve explicit unlimited LiteLLM budgets while treating absent or partial financial data as unavailable
prevent personal organizations and passively disabled settings from governance-budget maintenance
preserve intentional shared-team cap removal only for explicit enabled-to-disabled governance transitions
make purchases retryable when budget state is unavailable and add credits above current spend for unlimited or overspent accounts
render the localized no-budget-limit state without $NaN, and expose organization credit availability separately from balance

Validation

336 passed across affected enterprise billing, LiteLLM, organization, organization-route, and governance-budget unit modules
33 passed, 1 todo across the payment-form and manage-organization frontend suites
frontend typecheck, source ESLint, and Prettier passed
enterprise all-files pre-commit suite passed, including Ruff and mypy
GitHub Actions: 20 successful, 1 skipped, 0 failing

Notes

Migration 144 removes personal-organization governance rows so they cannot cause future LiteLLM budget mutations.
This PR does not guess historical caps for accounts that may already have been affected: the database does not retain an authoritative pre-wipe LiteLLM cap, and current spend or checkout totals cannot safely reconstruct initial grants, refunds, adjustments, or post-wipe spend. Historical reconciliation should use authoritative billing and audit data.
Existing Stripe callback tests still emit an unrelated warning for an unawaited AsyncSession.merge.

This pull request was updated by an AI agent (OpenHands) on behalf of Saurya Velagapudi.

Enterprise server image for this PR:

ghcr.io/openhands/enterprise-server:sha-0d4cc45

Co-authored-by: openhands <openhands@all-hands.dev>

github-actions · 2026-08-12T01:05:26Z

⚠️ This PR contains migrations. Please synchronize before merging to prevent conflicts.

Co-authored-by: openhands <openhands@all-hands.dev>

github-actions · 2026-08-12T01:28:24Z

Coverage report

Click to see where and how coverage changed

File	Statements	Missing	Coverage	Coverage (new stmts)	Lines missing
enterprise
run_budget_maintenance.py					23, 27, 36-37, 56-60
enterprise/server/routes
billing.py					83-87, 96-116, 292-309
org_models.py					102, 241-248
enterprise/server/services
org_budget_service.py					100-101, 104-105, 108-109, 122-125, 149-160, 194-197, 235-246, 274-275, 284, 287-290, 601-607
enterprise/storage
lite_llm_manager.py					101-117, 1260-1267
org_service.py					606, 611-626, 637-643, 861-872
Project Total

_{This report was generated by python-coverage-comment-action}

Co-authored-by: openhands <openhands@all-hands.dev>

…ing-credits

Co-authored-by: openhands <openhands@all-hands.dev>

saurya · 2026-08-17T15:27:37Z

E2E follow-up: OpenHands-Cloud #1103 adds release-level coverage for this PR.

I reviewed the existing open budget drafts (#1064, #1070, #1071, #1072, #1074, #1077, #1078, and #1080); they cover shared/team governance but not the personal-workspace and nullable/unlimited billing behavior here. The new draft extends the real Stripe flow to verify:

fresh personal organizations reject governance-budget access;
/api/billing/credits and /api/organizations agree on finite versus explicit unlimited credit state;
the UI renders localized No budget limit and never $NaN;
a $10 Stripe test purchase preserves finite balances and converts an unlimited balance into $10 of purchased credits.

Validation completed: locked dependency install, full TypeScript/ESLint/Prettier checks, Playwright test discovery, and the Cloud PR validate check all pass. Live release execution is still pending because this agent environment has no non-production BASE_URL, GitHub/Keycloak E2E credentials or mounted auth state, or Stripe-enabled deployment using ghcr.io/openhands/enterprise-server:pr-167. The draft documents that exact execution contract rather than substituting request mocks.

AI disclosure: This comment was generated by an AI agent (OpenHands) on behalf of the user.

saurya · 2026-08-17T23:14:28Z

Hey @hieptl - please take another look and offer any advice on how we can better test this code before merging. Since it's a sensitive piece of the product, I'd love to get more assurance.

hieptl

Thank you! 🙏

Renumber the personal organization budget cleanup migration to follow the current revision 147 head and update its regression-test import. Co-authored-by: openhands <openhands@all-hands.dev>

Resolve merge conflict in enterprise/tests/unit/test_org_budget_service.py by combining both branches' new tests: - main's test_sync_litellm_budgets_skips_passive_disabled_team_org (from #167) - this PR's test_sync_litellm_budgets_keeps_member_cap_stable_across_sessions Co-authored-by: openhands <openhands@all-hands.dev>

openhands-release-bot · 2026-08-25T12:35:25Z

🚀 Released in 1.55.0.

…hell Resolve conflicts with main (#167 null balance, #176 dropdown search term, #199 quota nav item) and align the merged result with the neo settings shell: - credits/payment: keep main's null balance -> "no budget limit" semantics - settings nav: add the Quota entry (subline + icon) and tokenize the quota page with the shared form-control helpers - settings loader: fall back to the backend's current org after a hard load so /settings/credits stays reachable - integrations: style the Jira member-guidance row like the other rows - tests: move the no-limit credits test with the credits UI; drop the legacy-sidebar avatar E2E spec (the sidebar no longer renders)

Fix personal organization billing credits

2f93eab

Co-authored-by: openhands <openhands@all-hands.dev>

saurya changed the title ~~Fix personal organization billing credit limits~~ fix: protect personal organization billing credits Aug 12, 2026

github-actions Bot added the type: fix A bug fix label Aug 12, 2026

fix: satisfy enterprise Python formatting

443a31d

Co-authored-by: openhands <openhands@all-hands.dev>

saurya requested a review from hieptl August 12, 2026 15:14

saurya marked this pull request as ready for review August 12, 2026 15:14

Merge branch 'main' into fix/personal-org-billing-credits

f75ba31

hieptl reviewed Aug 12, 2026

View reviewed changes

saurya and others added 3 commits August 12, 2026 10:04

fix: preserve billing credits across governance states

de292e0

Co-authored-by: openhands <openhands@all-hands.dev>

Merge remote-tracking branch 'origin/main' into fix/personal-org-bill…

10ef391

…ing-credits

style: apply enterprise ruff formatting

14af519

Co-authored-by: openhands <openhands@all-hands.dev>

saurya mentioned this pull request Aug 17, 2026

test(e2e): cover personal unlimited billing OpenHands/OpenHands-Cloud#1103

Draft

Merge branch 'main' into fix/personal-org-billing-credits

0781e24

hieptl approved these changes Aug 18, 2026

View reviewed changes

saurya and others added 2 commits August 19, 2026 09:39

Merge main and fix migration revision

3c406b1

Renumber the personal organization budget cleanup migration to follow the current revision 147 head and update its regression-test import. Co-authored-by: openhands <openhands@all-hands.dev>

Merge branch 'main' into fix/personal-org-billing-credits

ff82e52

This was referenced Aug 19, 2026

fix(budgets): prevent per-user allowance renewal on sync #205

Merged

test(e2e): cover budget maintenance incidents OpenHands/OpenHands-Cloud#1117

Open

fix(budgets): report budget spend from LiteLLM #207

Open

tofarr approved these changes Aug 20, 2026

View reviewed changes

Merge branch 'main' into fix/personal-org-billing-credits

0d4cc45

tofarr enabled auto-merge (squash) August 20, 2026 13:20

tofarr merged commit ac920c6 into main Aug 20, 2026
21 checks passed

tofarr deleted the fix/personal-org-billing-credits branch August 20, 2026 13:30

openhands-release-bot Bot mentioned this pull request Aug 20, 2026

chore(main): release 1.55.0 #211

Merged

tofarr mentioned this pull request Aug 21, 2026

fix(enterprise): await session.merge in billing success callback #226

Merged

6 tasks

openhands-release-bot Bot added the released: 1.55.0 Shipped in 1.55.0 label Aug 25, 2026

Navigation Menu

Uh oh!

fix: protect personal organization billing credits - #167

fix: protect personal organization billing credits#167
tofarr merged 10 commits into
mainfrom
fix/personal-org-billing-credits

saurya commented Aug 12, 2026 •

edited by github-actions Bot

Loading

Uh oh!

github-actions Bot commented Aug 12, 2026

Uh oh!

github-actions Bot commented Aug 12, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

saurya commented Aug 17, 2026

Uh oh!

saurya commented Aug 17, 2026

Uh oh!

hieptl left a comment

Uh oh!

Uh oh!

openhands-release-bot Bot commented Aug 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

saurya commented Aug 12, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Validation

Notes

Uh oh!

github-actions Bot commented Aug 12, 2026

Uh oh!

github-actions Bot commented Aug 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

saurya commented Aug 17, 2026

Uh oh!

saurya commented Aug 17, 2026

Uh oh!

hieptl left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

openhands-release-bot Bot commented Aug 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

saurya commented Aug 12, 2026 •

edited by github-actions Bot

Loading

github-actions Bot commented Aug 12, 2026 •

edited

Loading