Clarify Cloud VM capacity is shared

CLI/cmux.swift

@@ -4374,7 +4374,8 @@ struct CMUXCLI {
     // `vm_image_config_error`.
     /// `--size` spellings → memory in MB. The supported base-image ladder is
     /// 4 GB, 8 GB, 16 GB, 24 GB, 32 GB, and 64 GB of RAM, with disk sizes
-    /// following each image.
+    /// following each image. Pricing separately describes 5 vCPU, 20 GB RAM,
+    /// and 200 GB disk as one pool shared across the plan's Cloud VMs.
     private static let cloudVMSizeAliases: [String: Int] = [
         "4g": 4096, "4gb": 4096,
         "8g": 8192, "8gb": 8192,

Resources/Localizable.xcstrings

@@ -150566,13 +150566,13 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Up to 50 Cloud VMs, each with 8 GB RAM and 32 GB disk by default; sizes from 4 to 64 GB RAM are available"
+            "value": "Up to 50 Cloud VMs, all sharing a total pool of 5 vCPU, 20 GB RAM, and 200 GB disk; each VM starts at 8 GB RAM and 32 GB disk, with sizes from 4 to 64 GB RAM available as capacity allows"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "最大 50 台の Cloud VM、各 8 GB RAM / 32 GB ディスク（標準）。4～64 GB RAM のサイズを利用できます"
+            "value": "最大 50 台の Cloud VM、すべての VM で合計 5 vCPU / 20 GB RAM / 200 GB ディスクを共有。標準サイズは 8 GB RAM / 32 GB ディスクで、容量の範囲内で RAM 4～64 GB のサイズを選べます"
           }
         }
       }
@@ -150787,15 +150787,33 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Every Cloud VM has a configurable size: 4, 8, 16, 24, 32, or 64 GB RAM with 16, 32, 64, 96, or 128 GB disk. Pro and Team include up to 50 machines with no metering or overages."
+            "value": "Pro includes up to 50 Cloud VMs sharing a total pool of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same shared pool per user. The default VM size is 8 GB RAM and 32 GB disk; sizes from 4 to 64 GB RAM are available as capacity allows. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "すべての Cloud VM はサイズを選択できます。RAM は 4、8、16、24、32、64 GB、ディスクは 16、32、64、96、128 GB です。Pro と Team には最大 50 台のマシンが含まれ、従量課金や超過料金はありません。"
+            "value": "Pro では最大 50 台の Cloud VM で、合計 5 vCPU / 20 GB RAM / 200 GB ディスクを共有します。Team では同じ共有プールがユーザーごとに含まれます。標準 VM サイズは 8 GB RAM / 32 GB ディスクで、容量の範囲内で RAM 4～64 GB のサイズを選べます。新しい VM のディスクは 32 GB で開始し、共有プールの範囲内で拡張できます。従量課金や超過料金はありません。"
           }
-        }
+        },
+        "ar": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "bs": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "da": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "de": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "es": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "fr": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "it": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "km": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "ko": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "nb": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "pl": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "pt-BR": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "ru": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "th": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "tr": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "uk": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "zh-Hans": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } },
+        "zh-Hant": { "stringUnit": { "state": "translated", "value": "Pro includes up to 50 Cloud VMs, all sharing a total of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same allowance and shared capacity per user. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing." } }
       }
     },
     "pricing.native.sizes.colRate": {
@@ -150855,15 +150873,33 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud VM sizes"
+            "value": "Shared Cloud VM resources"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud VM サイズ"
+            "value": "Cloud VM 間で共有するリソース"
           }
-        }
+        },
+        "ar": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "bs": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "da": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "de": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "es": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "fr": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "it": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "km": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "ko": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "nb": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "pl": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "pt-BR": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "ru": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "th": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "tr": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "uk": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "zh-Hans": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } },
+        "zh-Hant": { "stringUnit": { "state": "translated", "value": "Shared Cloud VM resources" } }
       }
     },
     "pricing.native.status.billingUnavailable": {
@@ -150974,13 +151010,13 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Up to 50 Cloud VMs per user"
+            "value": "Up to 50 Cloud VMs per user, all sharing a total pool of 5 vCPU, 20 GB RAM, and 200 GB disk; each VM starts at 8 GB RAM and 32 GB disk, with sizes from 4 to 64 GB RAM available as capacity allows"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ユーザーごとに最大 50 台の Cloud VM"
+            "value": "ユーザーごとに最大 50 台の Cloud VM、すべての VM で合計 5 vCPU / 20 GB RAM / 200 GB ディスクを共有。標準サイズは 8 GB RAM / 32 GB ディスクで、容量の範囲内で RAM 4～64 GB のサイズを選べます"
           }
         }
       }

Sources/Cloud/NewMachineModel.swift

@@ -82,11 +82,13 @@ final class NewMachineModel {
     static let legacyPlanMachineMemoryMb = 20480
     /// Mirrors `maxMemoryMbForPlan`: development and paid plans may use the
     /// largest supported base image unless an operator sets a lower ceiling.
+    /// The pricing page separately describes the 5 vCPU / 20 GB RAM / 200 GB
+    /// disk pool shared across a paid plan's Cloud VMs.
     static func maxMemoryMb(planId: String?) -> Int {
         _ = planId
         return memoryOptionsMb.max() ?? planMachineMemoryMb
     }
-    /// Mirrors `defaultMemoryMbForPlan`: the plan machine, never above the max.
+    /// Mirrors `defaultMemoryMbForPlan`: the provider sizing profile, never above the max.
     static func defaultMemoryMb(planId: String?) -> Int {
         min(planMachineMemoryMb, maxMemoryMb(planId: planId))
     }

Sources/PricingPlansScreen.swift

@@ -417,7 +417,7 @@ private struct NativePricingPlansView: View {
                 isProminent: true,
                 features: [
                     String(localized: "pricing.native.pro.feature.vms", defaultValue: "Cloud agents on isolated Cloud VMs"),
-                    String(localized: "pricing.native.pro.feature.hours", defaultValue: "Up to 50 Cloud VMs, each with 5 vCPU, 20 GB RAM, and 32 GB disk"),
+                    String(localized: "pricing.native.pro.feature.hours", defaultValue: "Up to 50 Cloud VMs, all sharing a total pool of 5 vCPU, 20 GB RAM, and 200 GB disk; each VM starts at 8 GB RAM and 32 GB disk, with sizes from 4 to 64 GB RAM available as capacity allows"),
                     String(localized: "pricing.native.pro.feature.gateway", defaultValue: "Unlimited workspaces"),
                     String(localized: "pricing.native.pro.feature.ios", defaultValue: "cmux iOS app and email support"),
                 ]
@@ -432,7 +432,7 @@ private struct NativePricingPlansView: View {
                 features: [
                     String(localized: "pricing.native.team.feature.billing", defaultValue: "Unified billing for the whole team"),
                     String(localized: "pricing.native.team.feature.seats", defaultValue: "Centralized seat management"),
-                    String(localized: "pricing.native.team.feature.compute", defaultValue: "Up to 50 Cloud VMs per user"),
+                    String(localized: "pricing.native.team.feature.compute", defaultValue: "Up to 50 Cloud VMs per user, all sharing a total pool of 5 vCPU, 20 GB RAM, and 200 GB disk; each VM starts at 8 GB RAM and 32 GB disk, with sizes from 4 to 64 GB RAM available as capacity allows"),
                     String(localized: "pricing.native.team.feature.gateway", defaultValue: "Team-wide model gateway analytics"),
                     String(localized: "pricing.native.team.feature.support", defaultValue: "Priority email support"),
                 ]
@@ -762,12 +762,12 @@ private struct NativePricingTableCell: View {
 private struct NativePricingSizeSection: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
-            Text(String(localized: "pricing.native.sizes.title", defaultValue: "Cloud VM sizes"))
+            Text(String(localized: "pricing.native.sizes.title", defaultValue: "Shared Cloud VM resources"))
                 .font(.system(size: 13, weight: .medium))
                 .foregroundStyle(.secondary)
             Text(String(
                 localized: "pricing.native.sizes.body",
-                defaultValue: "Every Cloud VM is 5 vCPU, 20 GB RAM, and 32 GB disk. Disk can grow to 256 GiB. Pro and Team include up to 50 machines with no metering or overages."
+                defaultValue: "Pro includes up to 50 Cloud VMs sharing a total pool of 5 vCPU, 20 GB RAM, and 200 GB disk. Team includes the same shared pool per user. The default VM size is 8 GB RAM and 32 GB disk; sizes from 4 to 64 GB RAM are available as capacity allows. New VM disks start at 32 GB and can grow within the shared pool. There is no metering or overage billing."
             ))
             .font(.system(size: 13))
             .foregroundStyle(.secondary)

skills/cmux-billing/SKILL.md

@@ -37,7 +37,7 @@ Read before changing billing, pricing, Stripe, Pro entitlement, checkout, webhoo
 
 Prices live in `web/services/billing/plans.ts` and are provisioned by `web/scripts/stripe/provision-catalog.sh`. Current checkout keys: `cmux-pro-monthly-50` ($50/mo), `cmux-pro-yearly-480` ($480/yr, $40/mo equivalent), `cmux-team-monthly-60` ($60/user/mo), `cmux-team-yearly-576` ($576/user/yr, $48/mo equivalent). Stripe amounts are immutable, so a price change mints a new lookup key carrying the amount and adds the old key to `LEGACY_PRICE_LOOKUP_KEYS`; grandfathered Prices (`cmux-pro-monthly` $30, `cmux-pro-yearly` $240, `cmux-pro-yearly-288` $288, `cmux-team-monthly` $35, `cmux-team-yearly-336` $336) stay active for the subscriptions on them and `/dashboard/billing` prices every row from its own Stripe amount. Env price-id overrides carry the amount in their name (`STRIPE_PRO_MONTHLY_50_PRICE_ID` and friends); a retired name fails env validation, so delete it from Vercel before deploying a price change. Test-mode Pro product `prod_UyHgRPpmCzrkLJ`, live `prod_Uq4a28vk0fP3E6`. Staging webhook endpoint `we_1Tq1SZGhInAdn3JbWJReKNEN` forwards to `cmux-staging.vercel.app`; its secrets are already in the `cmux-staging` Vercel project.
 
-The plan machine (50 machines per billing team, 20 GB / 5 vCPU / 200 GB disk) lives in `web/services/vms/machineSpec.ts`; `web/tests/pro-pricing.test.ts` pins the pricing copy to those constants.
+The paid Cloud VM allowance lives in `web/services/vms/machineSpec.ts`: Pro allows up to 50 machines for one paid account. Team grants 50 machines per paid seat, so each paid seat adds one allowance and one shared pool. Each allowance shares 5 vCPU, 20 GB RAM, and 200 GB disk across its Cloud VMs. New provider machines start with a 32 GB disk and can grow. The VM repository persists reservations and enforces the aggregate pool under the billing-team lock, treating CPU and memory as shared ceilings and adding disk claims; the entitlement module only resolves the allowance and shared-capacity policy. `web/tests/pro-pricing.test.ts` pins the pricing copy and the provider starting disk.
 
 ## Feature flags
 

web/app/api/vm/[id]/fork/route.ts

@@ -15,6 +15,7 @@ import {
 import { forkVm, runVmWorkflow } from "../../../../../services/vms/workflows";
 import { VmTimingRecorder } from "../../../../../services/vms/timings";
 import { authProviderErrorResponse } from "../../../../../services/vms/authErrors";
+import { vmRequestLocale } from "../../../../../services/vms/vmErrorMessages";
 import {
   idempotencyKeyFromRequest,
   parseOptionalObjectBody,
@@ -94,10 +95,11 @@ export async function POST(
         });
       } catch (err) {
         if (isVmNotFoundError(err)) return notFoundVm(id);
-        const response = vmCreateLikeErrorResponse(err, {
+        const response = await vmCreateLikeErrorResponse(err, {
           operation: "fork",
           planId: entitlements.planId,
           retryAction: "Run `cmux vm ls`, then delete an active VM with `cmux vm rm <id>` before forking another.",
+          locale: vmRequestLocale(request),
         });
         if (response) return response;
         throw err;

web/app/api/vm/[id]/resize/route.ts

@@ -49,9 +49,11 @@ export async function POST(
         const stats = await runVmWorkflow(resizeVm({
           userId: user.id,
           billingTeamId: account.entitlements.billingTeamId,
+          billingPlanId: account.entitlements.planId,
           teamIds: user.teamIds,
           providerVmId: id,
           storageMb,
+          maxActiveVms: account.entitlements.maxActiveVms,
         }));
         return jsonResponse({
           id,