Repository navigation
feat(cli): carry plan-gate entitlement on machine-mode errors - #7271
Merged
Merged
Conversation
pamelachia
marked this pull request as ready for review
October 23, 2026 08:15
…-entitlement-json-errors # Conflicts: # apps/cli/src/shared/output/normalize-error.ts
Contributor
Author
|
Manual check from source against the Management API on a free-plan org:
|
Coly010
approved these changes
Oct 23, 2026
Coly010
left a comment
Contributor
There was a problem hiding this comment.
LGTM, a couple of small non-blocking asks inline
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Plan-gated Management API denials already return
{ error: { code: "entitlement_required", feature, upgrade_url } }. In--output-format jsonandstream-jsonthat signal only survives as escaped text insideerror.message, so an agent has to parse prose to learn that an upgrade is needed and where. I added a structuredentitlementto the machine-mode error object for every command whose status errors go throughmapHttpError.{"_tag":"Error","error":{"code":"DomainsUnexpectedStatusError","message":"...","entitlement":{"feature":"custom_domain","upgrade_url":"https://supabase.com/dashboard/org/<slug>/billing"}}}Changed:
mapHttpErrordecodes the untruncated body and, when it is the plan-gate envelope, attachesentitlement: { feature, upgrade_url }to the status error.normalizeCliErrorpasses it into the json and stream-json error object, so commands with no per-command upgrade wiring (branches unpause) get it too.branches create/update,vanity-subdomains activate/check-availabilityandsso list/add/update/removeforward the field, andOutput.faildeclares it in its type.http-errors.tsandsuggestUpgradereuses it.featuremust be a plain key andupgrade_urlan http(s) URL without credentials, emitted as the parsed URL so control and bidi characters arrive percent-encoded; anything else counts as no envelope.Note: text output and
cli_upgrade_suggestedare unchanged for well-formed envelopes. The per-command text hint stays until I move the hint and the event onto the same central path in a follow-up.Linear