Licensing: Remove supporter tier

- Remove `Supporter` variant from `AppStatus` and `LicenseType` enums (Rust), `LicenseStatus` union (TS), and all match/switch arms across 32 files
- Legacy supporter keys gracefully map to `Personal` at runtime (no crash)
- Remove supporter pricing card from website, shrink grid to 3 columns
- Simplify pricing page checkout JS: all purchases now go through org-name modal (no more direct-to-checkout branch)
- `getLicenseTypeFromPriceId` now returns `null` for unknown price IDs instead of silently defaulting to `commercial_subscription`
- Remove `PRICE_ID_SUPPORTER` from license server bindings, wrangler config, setup script, and `.env.example`
- Update ADR 016 with historical note, update 6 CLAUDE.md files and 3 spec docs

Author: vdavid

apps/desktop/src-tauri/src/commands/licensing.rs

@@ -2,7 +2,7 @@
 
 use crate::licensing;
 
-/// Get the current app status (personal, supporter, commercial, or expired).
+/// Get the current app status (personal, commercial, or expired).
 #[tauri::command]
 pub fn get_license_status(app: tauri::AppHandle) -> licensing::AppStatus {
     licensing::get_app_status(&app)

apps/desktop/src-tauri/src/licensing/CLAUDE.md

@@ -18,12 +18,11 @@ License keys are self-contained: `base64(JSON payload).base64(Ed25519 signature)
 
 ```
 Personal { show_commercial_reminder }   — no license
-Supporter { show_commercial_reminder }  — personal badge
 Commercial { license_type, organization_name, expires_at }
 Expired { organization_name, expired_at, show_modal }
 ```
 
-`LicenseType`: `Supporter`, `CommercialSubscription`, `CommercialPerpetual`.
+`LicenseType`: `CommercialSubscription`, `CommercialPerpetual`.
 
 ## Two-layer caching
 
@@ -49,7 +48,7 @@ return VerifyResult         ← LicenseInfo + full_key + short_code (nothing sto
 Frontend: validateLicenseWithServer(transactionId)
   |                                   ↑ passed explicitly since key isn't stored yet
   v
-Server says active/supporter → commitLicense(fullKey, shortCode) → persist + onSuccess
+Server says active            → commitLicense(fullKey, shortCode) → persist + onSuccess
 Server says expired          → commitLicense(fullKey, shortCode) → persist + show error
 Server says invalid          → DON'T commit. Show error. Nothing stored.
 Network error                → commitLicense(fullKey, shortCode) → persist + fallback
@@ -69,7 +68,7 @@ Legacy `activate_license`/`activate_license_async` wrappers still exist for back
 - Short codes: `CMDR-XXXX-XXXX-XXXX` (3 segments × 4 alphanumeric chars after CMDR prefix).
 - Key format: `base64(JSON).base64(signature)` — split on single `.`.
 - Public key embedded at compile time as hex in `verification.rs` (`PUBLIC_KEY_HEX`).
-- Mock values (`CMDR_MOCK_LICENSE`): `personal`, `personal_reminder`, `supporter`, `supporter_reminder`, `commercial`, `perpetual`, `expired`, `expired_no_modal`.
+- Mock values (`CMDR_MOCK_LICENSE`): `personal`, `personal_reminder`, `commercial`, `perpetual`, `expired`, `expired_no_modal`.
 - Key gen: see [license server CLAUDE.md](../../../../apps/license-server/CLAUDE.md) and
   [README.md](../../../../apps/license-server/README.md#first-time-setup) for the full setup.
 
@@ -103,7 +102,7 @@ Legacy `activate_license`/`activate_license_async` wrappers still exist for back
 **Why**: During activation, the key isn't stored yet, so the function can't read the transaction ID from the store. The frontend passes it explicitly. For periodic re-validation (7-day cycle), the parameter is `None` and the function falls back to reading from the stored license. This avoids storing the key just to read the transaction ID back.
 
 **Decision**: `CMDR_MOCK_LICENSE` env var bypasses all license logic including server calls.
-**Why**: License UX testing requires seeing every state (personal, supporter, commercial, expired, with/without modals). Without mocking, you'd need real license keys for each variant and a running license server. The mock skips network entirely, making UI development fast.
+**Why**: License UX testing requires seeing every state (personal, commercial, expired, with/without modals). Without mocking, you'd need real license keys for each variant and a running license server. The mock skips network entirely, making UI development fast.
 
 ## Gotchas
 

apps/desktop/src-tauri/src/licensing/app_status.rs

@@ -1,7 +1,7 @@
 //! Application license status and validation.
 //!
 //! This module handles:
-//! - License status checking (personal, supporter, commercial)
+//! - License status checking (personal, commercial)
 //! - Server-side validation for subscription status
 //! - Caching for offline use (30-day grace period)
 //! - Mock mode for local testing
@@ -31,7 +31,6 @@ const STORE_KEY_REMINDER_LAST_DISMISSED: &str = "commercial_reminder_last_dismis
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum LicenseType {
-    Supporter,
     CommercialSubscription,
     CommercialPerpetual,
 }
@@ -46,12 +45,6 @@ pub enum AppStatus {
         /// Whether to show the commercial license reminder modal.
         show_commercial_reminder: bool,
     },
-    /// Supporter license (personal use with badge).
-    #[serde(rename_all = "camelCase")]
-    Supporter {
-        /// Whether to show the commercial license reminder modal.
-        show_commercial_reminder: bool,
-    },
     /// Active commercial license.
     #[serde(rename_all = "camelCase")]
     Commercial {
@@ -211,9 +204,10 @@ fn response_to_app_status(
 }
 
 /// Convert string to LicenseType.
+///
+/// Legacy "supporter" keys are treated as personal (returns `None`).
 pub fn string_to_license_type(s: &str) -> Option<LicenseType> {
     match s {
-        "supporter" => Some(LicenseType::Supporter),
         "commercial_subscription" => Some(LicenseType::CommercialSubscription),
         "commercial_perpetual" => Some(LicenseType::CommercialPerpetual),
         _ => None,
@@ -230,9 +224,6 @@ fn to_app_status(
 ) -> AppStatus {
     match status {
         "active" => match license_type {
-            Some(LicenseType::Supporter) => AppStatus::Supporter {
-                show_commercial_reminder: should_show_commercial_reminder(app),
-            },
             Some(lt) => AppStatus::Commercial {
                 license_type: lt,
                 organization_name,
@@ -418,7 +409,6 @@ pub fn update_cached_status(
 pub fn get_window_title(status: &AppStatus) -> String {
     match status {
         AppStatus::Personal { .. } => "Cmdr – Personal use only".to_string(),
-        AppStatus::Supporter { .. } => "Cmdr – Personal".to_string(),
         AppStatus::Commercial { .. } => "Cmdr".to_string(),
         AppStatus::Expired { .. } => "Cmdr – Personal use only".to_string(),
     }
@@ -453,8 +443,6 @@ fn current_timestamp() -> u64 {
 /// Set CMDR_MOCK_LICENSE to one of:
 /// - "personal" - No license (no reminder)
 /// - "personal_reminder" - No license (shows commercial reminder modal)
-/// - "supporter" - Supporter badge (no reminder)
-/// - "supporter_reminder" - Supporter badge (shows commercial reminder modal)
 /// - "commercial" - Active commercial subscription
 /// - "perpetual" - Active perpetual license
 /// - "expired" - Expired subscription (shows modal)
@@ -470,10 +458,11 @@ fn get_mock_status(_app: &tauri::AppHandle) -> Option<AppStatus> {
         "personal_reminder" => Some(AppStatus::Personal {
             show_commercial_reminder: true,
         }),
-        "supporter" => Some(AppStatus::Supporter {
+        // Legacy: treat "supporter" / "supporter_reminder" as Personal
+        "supporter" => Some(AppStatus::Personal {
             show_commercial_reminder: false,
         }),
-        "supporter_reminder" => Some(AppStatus::Supporter {
+        "supporter_reminder" => Some(AppStatus::Personal {
             show_commercial_reminder: true,
         }),
         "commercial" => Some(AppStatus::Commercial {
@@ -520,14 +509,6 @@ mod tests {
         assert_eq!(get_window_title(&status), "Cmdr – Personal use only");
     }
 
-    #[test]
-    fn test_get_window_title_supporter() {
-        let status = AppStatus::Supporter {
-            show_commercial_reminder: false,
-        };
-        assert_eq!(get_window_title(&status), "Cmdr – Personal");
-    }
-
     #[test]
     fn test_get_window_title_commercial() {
         let status = AppStatus::Commercial {
@@ -560,7 +541,6 @@ mod tests {
 
     #[test]
     fn test_license_type_serialization() {
-        assert_eq!(serde_json::to_string(&LicenseType::Supporter).unwrap(), "\"supporter\"");
         assert_eq!(
             serde_json::to_string(&LicenseType::CommercialSubscription).unwrap(),
             "\"commercial_subscription\""
@@ -581,16 +561,6 @@ mod tests {
         assert!(json.contains("\"showCommercialReminder\":true"));
     }
 
-    #[test]
-    fn test_app_status_supporter_serialization() {
-        let status = AppStatus::Supporter {
-            show_commercial_reminder: false,
-        };
-        let json = serde_json::to_string(&status).unwrap();
-        assert!(json.contains("\"type\":\"supporter\""));
-        assert!(json.contains("\"showCommercialReminder\":false"));
-    }
-
     #[test]
     fn test_app_status_commercial_serialization() {
         let status = AppStatus::Commercial {

apps/desktop/src-tauri/src/licensing/validation_client.rs

@@ -17,7 +17,7 @@ const LICENSE_SERVER_URL: &str = "https://license.getcmdr.com";
 pub struct ValidationResponse {
     pub status: String, // "active", "expired", "invalid"
     #[serde(rename = "type")]
-    pub license_type: Option<String>, // "supporter", "commercial_subscription", "commercial_perpetual"
+    pub license_type: Option<String>, // "commercial_subscription", "commercial_perpetual"
     #[serde(rename = "organizationName")]
     pub organization_name: Option<String>,
     #[serde(rename = "expiresAt")]

apps/desktop/src/lib/licensing/AboutWindow.svelte

@@ -45,8 +45,6 @@
             return 'No license – only personal use allowed'
         }
         switch (status.type) {
-            case 'supporter':
-                return 'Personal license – thanks for your support ❤️'
             case 'commercial':
                 if (status.licenseType === 'commercial_perpetual') {
                     return `Perpetual commercial license for ${status.organizationName || 'your organization'}`
@@ -61,27 +59,14 @@
         }
     }
 
-    // Determine if we should show the license purchase/upgrade link
+    // Determine if we should show the license purchase link
     function shouldShowLicenseLink(): boolean {
         if (!status) return true
         if (status.type === 'personal') return true
         if (status.type === 'expired') return true
-        // Supporter shows "upgrade" to commercial
-        if (status.type === 'supporter') return true
         return false
     }
 
-    // Label varies by license state: "Get a license" for unlicensed, "Upgrade" for supporters
-    function getLicenseLinkLabel(): string {
-        if (status?.type === 'supporter') return 'Upgrade'
-        return 'Get a license'
-    }
-
-    // Determine if we should show the commercial upgrade prompt (for supporters)
-    function shouldShowCommercialPrompt(): boolean {
-        return status?.type === 'supporter'
-    }
-
     function handleLinkClick(url: string) {
         return (event: MouseEvent) => {
             event.preventDefault()
@@ -117,14 +102,6 @@
 
             <div class="license-info">
                 <p class="license-description">{getLicenseDescription()}</p>
-                {#if shouldShowCommercialPrompt()}
-                    <p class="commercial-prompt">
-                        Also using Cmdr for work? You must <a
-                            href="https://getcmdr.com/pricing"
-                            onclick={handleLinkClick('https://getcmdr.com/pricing')}>upgrade to a commercial license</a
-                        >.
-                    </p>
-                {/if}
             </div>
 
             <p class="ai-attribution">AI powered by Falcon-H1R-7B by Technology Innovation Institute (TII)</p>
@@ -134,7 +111,7 @@
                 {#if shouldShowLicenseLink()}
                     <span class="separator">•</span>
                     <a href="https://getcmdr.com/pricing" onclick={handleLinkClick('https://getcmdr.com/pricing')}
-                        >{getLicenseLinkLabel()}</a
+                        >Get a license</a
                     >
                 {/if}
                 <span class="separator">•</span>
@@ -221,22 +198,6 @@
         margin: 0;
     }
 
-    .commercial-prompt {
-        color: var(--color-text-secondary);
-        font-size: var(--font-size-md);
-        line-height: 1.5;
-        margin: var(--spacing-md) 0 0;
-    }
-
-    .commercial-prompt a {
-        color: var(--color-accent);
-        text-decoration: underline;
-    }
-
-    .commercial-prompt a:hover {
-        color: var(--color-accent-hover);
-    }
-
     .ai-attribution {
         color: var(--color-text-tertiary);
         font-size: var(--font-size-sm);

apps/desktop/src/lib/licensing/CLAUDE.md

@@ -9,7 +9,7 @@ for offline validation (no server call needed after activation).
 
 - `licensing-store.svelte.ts` — state management, validation trigger
 - `LicenseKeyDialog.svelte` — license key entry + details view (key-value display, "Use a different key" reset flow)
-- `CommercialReminderModal.svelte` — 30-day reminder for personal/supporter users
+- `CommercialReminderModal.svelte` — 30-day reminder for personal users
 - `ExpirationModal.svelte` — shown when commercial license expires
 - `AboutWindow.svelte` — displays current license status
 
@@ -23,7 +23,6 @@ for offline validation (no server call needed after activation).
 ## License types
 
 - **Personal** — free forever. Shows "Personal use only" in title bar. Commercial reminder every 30 days.
-- **Supporter** — $10 one-time. Same as Personal but with a badge in About window. Commercial reminder every 30 days.
 - **Commercial subscription** — $59/year. Server validation every 7 days. 14-day grace on network failure.
 - **Commercial perpetual** — $199 one-time. No periodic validation. 3 years of updates.
 - **Expired** — subscription expired. Shows modal once, then reverts to Personal behavior.
@@ -69,7 +68,7 @@ dismiss). The About window and modals read the cached value on mount.
 - **`handleActivate` uses verify/commit split** — calls `verifyLicense()` first (nothing stored), then
   `validateLicenseWithServer(transactionId)` passing the transaction ID explicitly, then decides whether to call
   `commitLicense()`. Four outcomes:
-    1. Server confirms active (commercial/supporter) → `commitLicense()` + `onSuccess()`.
+    1. Server confirms active (commercial) → `commitLicense()` + `onSuccess()`.
     2. Server says expired → `commitLicense()` + inline error with expiry date (key IS valid, just expired).
     3. Server says invalid (returns `personal` type) → DON'T commit. Nothing stored. Tracks `serverInvalidRetryCount`
        for escalating messaging. Cancel and X just close (no cleanup needed).

apps/desktop/src/lib/licensing/LicenseKeyDialog.svelte

@@ -66,7 +66,6 @@
     function getLicenseTypeLabel(licenseType: string | null | undefined): string | null {
         if (licenseType === 'commercial_perpetual') return 'Commercial perpetual'
         if (licenseType === 'commercial_subscription') return 'Commercial subscription'
-        if (licenseType === 'supporter') return 'Supporter'
         return null
     }
 
@@ -164,9 +163,6 @@
                 expiresAt: null,
             }
         }
-        if (info.licenseType === 'supporter') {
-            return { type: 'supporter', showCommercialReminder: false }
-        }
         return null
     }
 
@@ -226,7 +222,7 @@
             }
 
             // Step 3: Decide whether to commit (persist) the key based on server response.
-            if (newStatus?.type === 'commercial' || newStatus?.type === 'supporter') {
+            if (newStatus?.type === 'commercial') {
                 await commitLicense(verifyResult.fullKey, verifyResult.shortCode)
                 setPendingVerification(false)
                 setCachedStatus(newStatus)

apps/desktop/src/lib/licensing/licensing-store.svelte.ts

@@ -29,7 +29,7 @@ export async function loadLicenseStatus(): Promise<LicenseStatus> {
     licenseState.cachedStatus = status
 
     // Derive pending verification: license exists and is non-personal, but server has never confirmed it
-    if (status.type === 'commercial' || status.type === 'supporter') {
+    if (status.type === 'commercial') {
         const validated = await hasLicenseBeenValidated()
         licenseState.pendingVerification = !validated
     } else {

apps/desktop/src/lib/settings/CLAUDE.md

@@ -68,6 +68,7 @@ percentage-based, not pixel-based.
 radio group, or combobox — anything that benefits from consistent horizontal alignment.
 
 **When NOT to use `split`:**
+
 - Switches (too small; 50-50 wastes space and doesn't improve alignment)
 - Toggle groups (multi-button controls that may not fit in 50% width at narrow window sizes)
 - Full-width custom layouts (keyboard shortcuts table, license card, advanced auto-generated rows)

apps/desktop/src/lib/settings/sections/LicenseSection.svelte

@@ -64,8 +64,7 @@
                     <span
                         class="info-value"
                         class:status-expired={licenseStatus?.type === 'expired'}
-                        class:status-active={licenseStatus?.type === 'commercial' ||
-                            licenseStatus?.type === 'supporter'}>{statusText}</span
+                        class:status-active={licenseStatus?.type === 'commercial'}>{statusText}</span
                     >
                 </div>
             {/if}