manaflow-ai · lawrencecchen · Sep 11, 2026 · Sep 11, 2026 · Sep 11, 2026 · Sep 11, 2026
diff --git a/CLI/CMUXCLI+VMTransfer.swift b/CLI/CMUXCLI+VMTransfer.swift
@@ -983,7 +983,7 @@ extension CMUXCLI {
 
     static var vmRunUsage: String {
         """
-        Usage: cmux vm run [--sync] [--pull <remote-path>] [--machine <id>] [--new] [--size <20g>] [--timeout <seconds>] -- <command...>
+        Usage: cmux vm run [--sync] [--pull <remote-path>] [--machine <id>] [--new] [--size <8g>] [--timeout <seconds>] -- <command...>
 
         Run a command on a cloud machine without naming one: reuses an idle
         machine the router itself provisioned earlier (shown as "\(vmRunPoolLabel)"
@@ -999,7 +999,8 @@ extension CMUXCLI {
                                 current directory.
           --machine <id>        Skip routing and use this machine.
           --new                 Force a fresh pool machine.
-          --size <s>            Memory preset for a machine this run creates.
+          --size <s>            Memory preset for a machine this run creates
+                                (4g to 24g on Pro; 32g and 64g need cmux Max).
           --timeout <seconds>   Command timeout (default \(vmRunDefaultTimeoutSeconds)s, max 15 minutes).
           --wait, --output      Accepted for symmetry with `vm agent`; `vm run` always
                                 blocks on the command and prints its output.
@@ -1070,7 +1071,7 @@ extension CMUXCLI {
         var memoryMb: Int?
         if let sizeOption {
             guard let parsed = Self.parseCloudVMSize(sizeOption) else {
-                throw CLIError(message: "vm run: unknown size '\(sizeOption)'. Sizes: 20g (the plan machine) or memory in MB (at least 512).")
+                throw CLIError(message: "vm run: unknown size '\(sizeOption)'. Sizes: 4g, 8g, 16g, 24g on Pro (32g and 64g need cmux Max), or memory in MB (at least 512).")
             }
             memoryMb = parsed
         }
@@ -1502,7 +1503,7 @@ extension CMUXCLI {
 extension CMUXCLI {
     static var vmRouteUsage: String {
         """
-        Usage: cmux vm route [--cwd <dir>] [--new] [--provision] [--size <20g>] [--json]
+        Usage: cmux vm route [--cwd <dir>] [--new] [--provision] [--size <8g>] [--json]
 
         Print the machine `cmux vm run` / `cmux vm agent` would use for work in a
         directory, and why — without running anything. The policy is the router's
@@ -1515,7 +1516,8 @@ extension CMUXCLI {
           --cwd <dir>    Route for this directory (default: the current one).
           --new          Ignore the pool and report a fresh machine.
           --provision    Actually create the machine when routing would.
-          --size <s>     Memory preset for a machine --provision creates.
+          --size <s>     Memory preset for a machine --provision creates
+                         (4g to 24g on Pro; 32g and 64g need cmux Max).
           --json         {machine, created, reason, would_provision, directory}
         """
     }
@@ -1560,7 +1562,8 @@ extension CMUXCLI {
           --timeout <s>    With --wait: give up waiting after this many seconds
                            (exit 1, the agent is not stopped). Default: no limit.
           --new            Force a fresh pool machine.
-          --size <s>       Memory preset for a machine this call creates.
+          --size <s>       Memory preset for a machine this call creates
+                           (4g to 24g on Pro; 32g and 64g need cmux Max).
 
         Examples:
           cmux vm agent --agent claude --sync -- "run the test suite and fix failures"
@@ -1663,7 +1666,7 @@ extension CMUXCLI {
         var memoryMb: Int?
         if let sizeOption {
             guard let parsed = Self.parseCloudVMSize(sizeOption) else {
-                throw CLIError(message: "vm route: unknown size '\(sizeOption)'. Sizes: 20g (the plan machine) or memory in MB (at least 512).")
+                throw CLIError(message: "vm route: unknown size '\(sizeOption)'. Sizes: 4g, 8g, 16g, 24g on Pro (32g and 64g need cmux Max), or memory in MB (at least 512).")
             }
             memoryMb = parsed
         }
@@ -1762,7 +1765,7 @@ extension CMUXCLI {
         var memoryMb: Int?
         if let sizeOption {
             guard let parsed = Self.parseCloudVMSize(sizeOption) else {
-                throw CLIError(message: "vm agent: unknown size '\(sizeOption)'. Sizes: 20g (the plan machine) or memory in MB (at least 512).")
+                throw CLIError(message: "vm agent: unknown size '\(sizeOption)'. Sizes: 4g, 8g, 16g, 24g on Pro (32g and 64g need cmux Max), or memory in MB (at least 512).")
             }
             memoryMb = parsed
         }

diff --git a/CLI/cmux.swift b/CLI/cmux.swift
@@ -5536,6 +5536,30 @@ struct CMUXCLI {
         case "vpn":
             try runVPNCommand(commandArgs: commandArgs, client: client, jsonOutput: jsonOutput)
 
+        case "billing":
+            let (planOption, rest) = parseOption(Array(commandArgs.dropFirst()), name: "--plan")
+            let plan = planOption ?? "max"
+            guard commandArgs.first == "checkout", ["pro", "max"].contains(plan), rest.allSatisfy({ $0 == "--no-open" }) else {
+                throw CLIError(message: "Usage: cmux billing checkout --plan <max|pro> [--no-open]")
+            }
+            let response = try client.sendV2(method: "vm.billing_checkout", params: ["plan": plan])
+            guard let url = response["url"] as? String else {
+                throw CLIError(message: "Checkout URL is missing. Open https://cmux.com/pricing.")
+            }
+            if !rest.contains("--no-open") && !jsonOutput {
+                let process = Process()
+                process.executableURL = URL(fileURLWithPath: openToolPath())
+                process.arguments = [url]
+                try process.run()
+                process.waitUntilExit()
+            }
+            if jsonOutput {
+                print(jsonString(response))
+            } else {
+                print(url)
+                print("Review the plan and price in your browser. After payment, retry your VM command.")
+            }
+
         case "auth", "login", "logout":
             let authArgs = command == "auth" ? commandArgs : [command] + commandArgs
             let sub = authArgs.first?.lowercased() ?? "status"
@@ -5919,7 +5943,7 @@ struct CMUXCLI {
                             vm new: unknown size '\(sizeOpt)'.
 
                             Sizes: 4g, 8g, 16g, 24g, 32g, 64g (or memory in MB).
-                            Plans cap the largest size; `cmux vm ls` shows your plan.
+                            Pro starts 4g to 24g; 32g and 64g need cmux Max. `cmux vm ls` shows your plan.
                             """)
                     }
                     memoryMb = parsed
@@ -5935,7 +5959,7 @@ struct CMUXCLI {
                         vm new: unknown flag '\(unknown)'.
 
                         Known flags:
-                          --size <4g|8g|16g|24g|32g|64g>
+                          --size <4g|8g|16g|24g|32g|64g>  4g to 24g on Pro; 32g and 64g need cmux Max
                           --desktop, --base  \(String(localized: "cli.vm.help.legacyKindFlags", defaultValue: "accepted for older scripts; every machine has a screen"))
                           --name <label>    display label (the id stays the address)
                           --image <image-id>  explicit image override (normally omit)
@@ -18371,6 +18395,8 @@ struct CMUXCLI {
             never leave this Mac. Signed builds fail closed if the Network
             Extension is absent. There is no privileged fallback.
             """
+        case "billing":
+            return "Usage: cmux billing checkout --plan <max|pro> [--no-open]\n\nCreate checkout for the signed-in cmux account. Max is $200/month. Payment requires browser confirmation. --no-open or --json returns the URL without opening a browser."
         case "auth":
             return """
             Usage: cmux auth <status|login|logout>

diff --git a/Packages/Shared/CmuxAPIClient/Sources/CmuxAPIClient/CmuxAPIClient.swift b/Packages/Shared/CmuxAPIClient/Sources/CmuxAPIClient/CmuxAPIClient.swift
@@ -64,6 +64,7 @@ public struct CmuxAPIClient: Sendable {
                 userID: body.userId,
                 email: body.email,
                 planID: body.planId.rawValue,
+                subscriptionPlanID: body.subscriptionPlanId.rawValue,
                 isPro: body.isPro,
                 billingManagement: body.billingManagement.rawValue
             )

diff --git a/Packages/Shared/CmuxAPIClient/Sources/CmuxAPIClient/CmuxAccountPlan.swift b/Packages/Shared/CmuxAPIClient/Sources/CmuxAPIClient/CmuxAccountPlan.swift
@@ -5,8 +5,10 @@ public struct CmuxAccountPlan: Sendable, Hashable {
     public var userID: String
     /// Primary email, or the empty string when the Stack user has none.
     public var email: String
-    /// Resolved plan identifier, currently `"free"` or `"pro"`.
+    /// Resolved plan family, `"free"` or `"pro"` (a Max subscriber is `"pro"` here).
     public var planID: String
+    /// The exact personal plan: `"free"`, `"pro"`, or `"max"`.
+    public var subscriptionPlanID: String
     /// Whether the account has an active Pro entitlement.
     public var isPro: Bool
     /// How billing is managed for this account: `"stripe"`, `"external"`, or `"none"`.
@@ -16,19 +18,22 @@ public struct CmuxAccountPlan: Sendable, Hashable {
     /// - Parameters:
     ///   - userID: Stack user id of the signed-in account.
     ///   - email: Primary email, or the empty string when there is none.
-    ///   - planID: Resolved plan identifier (`"free"` or `"pro"`).
+    ///   - planID: Resolved plan family (`"free"` or `"pro"`).
+    ///   - subscriptionPlanID: The exact personal plan (`"free"`, `"pro"`, or `"max"`).
     ///   - isPro: Whether the account has an active Pro entitlement.
     ///   - billingManagement: `"stripe"`, `"external"`, or `"none"`.
     public init(
         userID: String,
         email: String,
         planID: String,
+        subscriptionPlanID: String,
         isPro: Bool,
         billingManagement: String
     ) {
         self.userID = userID
         self.email = email
         self.planID = planID
+        self.subscriptionPlanID = subscriptionPlanID
         self.isPro = isPro
         self.billingManagement = billingManagement
     }

diff --git a/Packages/Shared/CmuxAPIClient/Sources/CmuxAPIClient/openapi.json b/Packages/Shared/CmuxAPIClient/Sources/CmuxAPIClient/openapi.json
@@ -14,7 +14,7 @@
       "get": {
         "operationId": "account.me",
         "summary": "Get the authenticated account and plan",
-        "description": "Returns the signed-in user's id, primary email, and resolved billing plan (free or pro).",
+        "description": "Returns the signed-in user's id, primary email, and resolved billing plan (free, pro, or max).",
         "tags": [
           "Account"
         ],
@@ -39,6 +39,14 @@
                       ],
                       "type": "string"
                     },
+                    "subscriptionPlanId": {
+                      "enum": [
+                        "free",
+                        "pro",
+                        "max"
+                      ],
+                      "type": "string"
+                    },
                     "isPro": {
                       "type": "boolean"
                     },
@@ -55,6 +63,7 @@
                     "userId",
                     "email",
                     "planId",
+                    "subscriptionPlanId",
                     "isPro",
                     "billingManagement"
                   ]