feat(cli): add upgrade paths, locations, and billing links to account plan [AI-72] (#1264)

* feat(cli): add upgrade path, locations, and billing link to account plan formatters

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* feat(cli): add --disabled flag, billing link, and upgradeUrl to account plan

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* test(cli): add e2e tests for upgrade paths and --disabled flag

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* refactor(cli): extract shared upgradeColumn and getAccountAppUrl

- Deduplicate REQUIRED UPGRADE column definition into a shared
  `upgradeColumn` constant used by all three table types
- Extract `getAccountAppUrl()` to rest/api.ts as a shared utility
  for constructing account-scoped app URLs (same base URL pattern
  as getTestSessionUrl in reporters/util.ts)

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* fix(cli): widen REQUIRED UPGRADE column to prevent text overflow

* feat(cli): show Contact sales for disabled entitlements without upgrade path

Disabled entitlements with no requiredPlan/requiredAddon now show
"Contact sales" in the REQUIRED UPGRADE column and link to
checklyhq.com/contact-sales instead of the billing checkout page.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* feat(cli): show both self-service and enterprise upgrade links

Plan header now shows both links:
- Self-service upgrade: billing checkout URL
- For Enterprise: checklyhq.com/contact-sales/

Detail view uses contact sales URL for CONTRACT entitlements.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* feat(cli): add color styling and use production app URL

- Cyan bold labels for Plan, Locations, Add-ons, Metered entitlements
- Magenta highlight on full rows for disabled entitlements in tables
- Green/magenta bold counts in the summary line
- Dim location names for subtlety
- Hardcode production URL (https://app.checklyhq.com) instead of
  deriving from API base URL
- Remove unused getAccountAppUrl from api.ts

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* fix(cli): skip row highlighting when all rows are disabled

* feat(cli): add per-entitlement upgradeUrl to JSON output

Each disabled entitlement now includes an upgradeUrl field in JSON:
- Self-serve features: billing checkout URL
- Enterprise/CONTRACT features: contact sales URL
- Enabled features: no upgradeUrl (clean)

Top-level JSON also includes both upgradeUrl and contactSalesUrl.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

* refactor(cli): unify upgrade URL routing and constants

- Extract shared getEntitlementUpgradeUrl() from formatter, used by
  both detail view and JSON enrichment (was duplicated)
- Export CONTACT_SALES_URL from formatter, remove duplicate in command
- Rename top-level JSON key from upgradeUrl to checkoutUrl for clarity
- Simplify withUpgradeUrl to delegate to shared function

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>

Author: thebiglabasky

packages/cli/e2e/__tests__/account-plan.spec.ts

@@ -120,4 +120,67 @@ describe('checkly account plan', () => {
     })
     expect(result.status).not.toBe(0)
   })
+
+  it('should show REQUIRED UPGRADE column in summary view', async () => {
+    const result = await runChecklyCli({
+      args: ['account', 'plan'],
+      apiKey: config.get('apiKey'),
+      accountId: config.get('accountId'),
+    })
+    expect(result.status).toBe(0)
+    expect(result.stdout).toContain('REQUIRED UPGRADE')
+  })
+
+  it('should show billing checkout link', async () => {
+    const result = await runChecklyCli({
+      args: ['account', 'plan'],
+      apiKey: config.get('apiKey'),
+      accountId: config.get('accountId'),
+    })
+    expect(result.status).toBe(0)
+    expect(result.stdout).toContain('billing/checkout')
+  })
+
+  it('should include checkoutUrl and contactSalesUrl in JSON output', async () => {
+    const result = await runChecklyCli({
+      args: ['account', 'plan', '--output', 'json'],
+      apiKey: config.get('apiKey'),
+      accountId: config.get('accountId'),
+    })
+    expect(result.status).toBe(0)
+    const parsed = JSON.parse(result.stdout)
+    expect(parsed).toHaveProperty('checkoutUrl')
+    expect(parsed.checkoutUrl).toContain('billing/checkout')
+    expect(parsed).toHaveProperty('contactSalesUrl')
+    expect(parsed.contactSalesUrl).toContain('contact-sales')
+  })
+
+  it('should filter with --disabled flag', async () => {
+    const result = await runChecklyCli({
+      args: ['account', 'plan', '--disabled'],
+      apiKey: config.get('apiKey'),
+      accountId: config.get('accountId'),
+    })
+    expect(result.status).toBe(0)
+    expect(result.stdout).toContain('entitlement')
+  })
+
+  it('should combine --disabled with --type', async () => {
+    const result = await runChecklyCli({
+      args: ['account', 'plan', '--disabled', '--type', 'flag'],
+      apiKey: config.get('apiKey'),
+      accountId: config.get('accountId'),
+    })
+    expect(result.status).toBe(0)
+    expect(result.stdout).toContain('REQUIRED UPGRADE')
+  })
+
+  it('should fail when combining key with --disabled', async () => {
+    const result = await runChecklyCli({
+      args: ['account', 'plan', 'BROWSER_CHECKS', '--disabled'],
+      apiKey: config.get('apiKey'),
+      accountId: config.get('accountId'),
+    })
+    expect(result.status).not.toBe(0)
+  })
 })

packages/cli/src/commands/account/plan.ts

@@ -7,7 +7,15 @@ import {
   formatPlanSummary,
   formatEntitlementDetail,
   formatFilteredEntitlements,
+  getEntitlementUpgradeUrl,
+  CONTACT_SALES_URL,
 } from '../../formatters/account-plan'
+import type { Entitlement } from '../../rest/entitlements'
+
+function withUpgradeUrl (e: Entitlement, checkoutUrl: string) {
+  if (e.enabled) return e
+  return { ...e, upgradeUrl: getEntitlementUpgradeUrl(e, checkoutUrl) }
+}
 
 export default class AccountPlan extends AuthCommand {
   static coreCommand = false
@@ -33,16 +41,20 @@ export default class AccountPlan extends AuthCommand {
       char: 's',
       description: 'Search entitlements by name or description.',
     }),
+    disabled: Flags.boolean({
+      description: 'Show only entitlements not included in your plan.',
+      default: false,
+    }),
     output: outputFlag({ default: 'table' }),
   }
 
   async run (): Promise<void> {
     const { args, flags } = await this.parse(AccountPlan)
     this.style.outputFormat = flags.output
 
-    // Validate: key arg is mutually exclusive with --type and --search
-    if (args.key && (flags.type || flags.search)) {
-      this.error('Cannot use --type or --search when looking up a specific entitlement key.')
+    // Validate: key arg is mutually exclusive with --type, --search, and --disabled
+    if (args.key && (flags.type || flags.search || flags.disabled)) {
+      this.error('Cannot use --type, --search, or --disabled when looking up a specific entitlement key.')
     }
 
     let plan
@@ -55,6 +67,9 @@ export default class AccountPlan extends AuthCommand {
       return
     }
 
+    const { accountId } = api.getDefaults()
+    const checkoutUrl = `https://app.checklyhq.com/accounts/${accountId}/billing/checkout`
+
     // Single key lookup
     if (args.key) {
       const entitlement = plan.entitlements.find(e => e.key === args.key)
@@ -63,19 +78,23 @@ export default class AccountPlan extends AuthCommand {
       }
 
       if (flags.output === 'json') {
-        this.log(JSON.stringify(entitlement, null, 2))
+        this.log(JSON.stringify(withUpgradeUrl(entitlement, checkoutUrl), null, 2))
         return
       }
 
       const fmt: OutputFormat = flags.output === 'md' ? 'md' : 'terminal'
-      this.log(formatEntitlementDetail(plan, entitlement, fmt))
+      this.log(formatEntitlementDetail(plan, entitlement, fmt, checkoutUrl))
       return
     }
 
-    // Apply filters (--type and --search)
-    const hasFilters = flags.type || flags.search
+    // Apply filters (--type, --search, --disabled)
+    const hasFilters = flags.type || flags.search || flags.disabled
     let filtered = plan.entitlements
 
+    if (flags.disabled) {
+      filtered = filtered.filter(e => !e.enabled)
+    }
+
     if (flags.type) {
       filtered = filtered.filter(e => e.type === flags.type)
     }
@@ -91,19 +110,29 @@ export default class AccountPlan extends AuthCommand {
 
     // JSON output (respects filters)
     if (flags.output === 'json') {
-      this.log(JSON.stringify(hasFilters ? filtered : plan, null, 2))
+      const enriched = filtered.map(e => withUpgradeUrl(e, checkoutUrl))
+      if (hasFilters) {
+        this.log(JSON.stringify(enriched, null, 2))
+      } else {
+        this.log(JSON.stringify({
+          ...plan,
+          checkoutUrl,
+          contactSalesUrl: CONTACT_SALES_URL,
+          entitlements: enriched,
+        }, null, 2))
+      }
       return
     }
 
     const fmt: OutputFormat = flags.output === 'md' ? 'md' : 'terminal'
 
     // Filtered view
     if (hasFilters) {
-      this.log(formatFilteredEntitlements(plan, filtered, fmt))
+      this.log(formatFilteredEntitlements(plan, filtered, fmt, checkoutUrl))
       return
     }
 
     // Default summary view
-    this.log(formatPlanSummary(plan, fmt))
+    this.log(formatPlanSummary(plan, fmt, checkoutUrl))
   }
 }

packages/cli/src/formatters/__tests__/__fixtures__/account-plan-fixtures.ts

@@ -0,0 +1,139 @@
+import type { Entitlement, AccountPlan } from '../../../rest/entitlements'
+
+// --- Entitlements ---
+
+export const enabledMetered: Entitlement = {
+  key: 'BROWSER_CHECKS',
+  name: 'Browser checks',
+  description: 'Maximum number of browser checks',
+  type: 'metered',
+  enabled: true,
+  quantity: 10,
+}
+
+export const disabledMeteredWithUpgrade: Entitlement = {
+  key: 'PRIVATE_LOCATIONS',
+  name: 'Private locations',
+  description: 'Maximum number of private locations',
+  type: 'metered',
+  enabled: false,
+  requiredPlan: 'TEAM',
+  requiredPlanDisplayName: 'Team',
+}
+
+export const enabledFlag: Entitlement = {
+  key: 'SMS_ALERTS',
+  name: 'SMS alerts',
+  description: 'Receive alert notifications via SMS',
+  type: 'flag',
+  enabled: true,
+}
+
+export const disabledFlagPlanOnly: Entitlement = {
+  key: 'ADVANCED_ALERT_CHANNELS',
+  name: 'Advanced alert channels',
+  description: 'Alert channels like OpsGenie, PagerDuty',
+  type: 'flag',
+  enabled: false,
+  requiredPlan: 'TEAM',
+  requiredPlanDisplayName: 'Team',
+}
+
+export const disabledFlagAddonOnly: Entitlement = {
+  key: 'STATUS_PAGES_BULK_SUBSCRIBE',
+  name: 'Status page bulk subscribe',
+  description: 'Bulk subscribe contacts to status page notifications',
+  type: 'flag',
+  enabled: false,
+  requiredAddon: {
+    name: 'communicate',
+    displayName: 'Communicate',
+    tier: 'TIER_STARTER',
+    tierDisplayName: 'Starter',
+  },
+}
+
+export const disabledFlagBothPlanAndAddon: Entitlement = {
+  key: 'STATUS_PAGES_SLACK_NOTIFICATIONS',
+  name: 'Status page Slack notifications',
+  description: 'Send status page updates to Slack channels',
+  type: 'flag',
+  enabled: false,
+  requiredPlan: 'STARTER',
+  requiredPlanDisplayName: 'Starter',
+  requiredAddon: {
+    name: 'communicate',
+    displayName: 'Communicate',
+    tier: 'TIER_STARTER',
+    tierDisplayName: 'Starter',
+  },
+}
+
+export const disabledFlagNoUpgradeData: Entitlement = {
+  key: 'DATACENTER_BARE_METAL',
+  name: 'Bare metal data centers',
+  description: 'Run checks from dedicated bare metal infrastructure',
+  type: 'flag',
+  enabled: false,
+}
+
+// --- Account Plans ---
+
+export const hobbyPlan: AccountPlan = {
+  plan: 'hobby',
+  planDisplayName: 'Hobby',
+  addons: {},
+  locations: {
+    all: [
+      { id: 'us-east-1', name: 'N. Virginia', available: true },
+      { id: 'us-east-2', name: 'Ohio', available: false },
+      { id: 'eu-central-1', name: 'Frankfurt', available: true },
+      { id: 'eu-west-1', name: 'Ireland', available: false },
+      { id: 'ap-southeast-1', name: 'Singapore', available: true },
+    ],
+    maxPerCheck: 3,
+  },
+  entitlements: [
+    enabledMetered,
+    disabledMeteredWithUpgrade,
+    enabledFlag,
+    disabledFlagPlanOnly,
+    disabledFlagAddonOnly,
+    disabledFlagBothPlanAndAddon,
+    disabledFlagNoUpgradeData,
+  ],
+}
+
+export const teamPlan: AccountPlan = {
+  plan: 'team',
+  planDisplayName: 'Team',
+  addons: {
+    communicate: { tier: 'TIER_STARTER', tierDisplayName: 'Communicate Starter' },
+  },
+  locations: {
+    all: [
+      { id: 'us-east-1', name: 'N. Virginia', available: true },
+      { id: 'eu-central-1', name: 'Frankfurt', available: true },
+    ],
+    maxPerCheck: 6,
+  },
+  entitlements: [
+    { ...enabledMetered, quantity: 50 },
+    {
+      ...disabledMeteredWithUpgrade,
+      enabled: true,
+      quantity: 10,
+      requiredPlan: undefined,
+      requiredPlanDisplayName: undefined,
+    },
+    enabledFlag,
+    { ...disabledFlagPlanOnly, enabled: true, requiredPlan: undefined, requiredPlanDisplayName: undefined },
+  ],
+}
+
+export const planWithoutLocations: AccountPlan = {
+  plan: 'hobby',
+  planDisplayName: 'Hobby',
+  addons: {},
+  entitlements: [enabledMetered, disabledFlagPlanOnly],
+}