diff --git a/apps/supercode-cli/client/app/layout.tsx b/apps/supercode-cli/client/app/layout.tsx
index 08d4172..834ce74 100644
--- a/apps/supercode-cli/client/app/layout.tsx
+++ b/apps/supercode-cli/client/app/layout.tsx
@@ -3,6 +3,7 @@ import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
 import { ThemeProvider } from "@/components/theme-provider";
 import { Toaster } from "sonner";
+import { DodoPaymentsScript } from "@/components/DodoPaymentsScript";
 
 const geistSans = Geist({
   variable: "--font-geist-sans",
@@ -37,6 +38,7 @@ export default function RootLayout({
         >
           <Toaster/>
         {children}
+        <DodoPaymentsScript />
         </ThemeProvider>
       </body>
     </html>
diff --git a/apps/supercode-cli/client/app/studio/page.tsx b/apps/supercode-cli/client/app/studio/page.tsx
new file mode 100644
index 0000000..0d7eac5
--- /dev/null
+++ b/apps/supercode-cli/client/app/studio/page.tsx
@@ -0,0 +1,782 @@
+"use client"
+
+import { Suspense, useEffect, useState, useCallback } from "react"
+import { useRouter, useSearchParams } from "next/navigation"
+import { authClient } from "@/lib/auth-client"
+import { Spinner } from "@/components/ui/spinner"
+import { Button } from "@/components/ui/button"
+import { Card, CardContent } from "@/components/ui/card"
+import { Badge } from "@/components/ui/badge"
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/components/ui/alert-dialog"
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog"
+import { toast } from "sonner"
+import {
+  ArrowUpRight,
+  Loader2,
+  Sparkles,
+  Shield,
+  RefreshCw,
+  ExternalLink,
+  AlertTriangle,
+  CheckCircle2,
+  Zap,
+} from "lucide-react"
+
+type Plan = {
+  id: string
+  tier: string
+  name: string
+  description: string | null
+  variant: string | null
+  interval: string | null
+  priceCents: number
+  currency: string
+  requestLimit: number
+  contextLimit: number
+  modelAccess: string
+  creditAmountCents: number
+  dodoProductId: string | null
+  sortOrder: number
+}
+
+type SubscriptionInfo = {
+  id: string
+  status: string
+  currentPeriodStart: string | null
+  currentPeriodEnd: string | null
+  trialEndsAt: string | null
+  cancelAtPeriodEnd: boolean
+  isGrandfathered: boolean
+}
+
+type CreditBalance = {
+  balanceCents: number
+  totalCredits: number
+  resetAt: string | null
+}
+
+const CHECKOUT_BASE =
+  process.env.NEXT_PUBLIC_DODO_CHECKOUT_BASE ?? "https://checkout.dodopayments.com/buy"
+
+const PRODUCT_CHECKOUT_URLS: Record<string, string> = {
+  // ── test mode ──
+  pdt_0Nk0u6EggnAdDxGtoLa1W: `${CHECKOUT_BASE}/pdt_0Nk0u6EggnAdDxGtoLa1W?quantity=1`,
+  pdt_0NkRjph71bwF2z3aBulCG: `${CHECKOUT_BASE}/pdt_0Nk0vwfI1kYrDaRsQzEUQ?quantity=1`,
+  pdt_0Nk0vS5WMtkT7u2T7P70e: `${CHECKOUT_BASE}/pdt_0Nk0vS5WMtkT7u2T7P70e?quantity=1`,
+  pdt_0NkRm62YJBP043k9sEDab: `${CHECKOUT_BASE}/pdt_0NkRm62YJBP043k9sEDab?quantity=1`,
+  pdt_0Nk0vwfI1kYrDaRsQzEUQ: `${CHECKOUT_BASE}/pdt_0Nk0vwfI1kYrDaRsQzEUQ?quantity=1`,
+  pdt_0NkRmfmsthQToUr41UAnd: `${CHECKOUT_BASE}/pdt_0NkRmfmsthQToUr41UAnd?quantity=1`,
+  pdt_0NkRmxBRNTOME3FYF9Qkg: `${CHECKOUT_BASE}/pdt_0NkRmxBRNTOME3FYF9Qkg?quantity=1`,
+  // ── live mode ──
+  pdt_0NkW4k2cUeO1f7a8yLje5: `${CHECKOUT_BASE}/pdt_0NkW4k2cUeO1f7a8yLje5?quantity=1`,
+  pdt_0NkW59I3J7uy2m1j0RAOF: `${CHECKOUT_BASE}/pdt_0NkW59I3J7uy2m1j0RAOF?quantity=1`,
+  pdt_0NkW5Vvq7Uxw55sjMlDFe: `${CHECKOUT_BASE}/pdt_0NkW5Vvq7Uxw55sjMlDFe?quantity=1`,
+  pdt_0NkW5s9M64jbHMoKrIpsl: `${CHECKOUT_BASE}/pdt_0NkW5s9M64jbHMoKrIpsl?quantity=1`,
+  pdt_0NkW6PfRqqooJXIMaX4Ci: `${CHECKOUT_BASE}/pdt_0NkW6PfRqqooJXIMaX4Ci?quantity=1`,
+  pdt_0NkW6cjti170KbFpeolfw: `${CHECKOUT_BASE}/pdt_0NkW6cjti170KbFpeolfw?quantity=1`,
+  pdt_0NkW6tnjud9Sp1iGr9TXj: `${CHECKOUT_BASE}/pdt_0NkW6tnjud9Sp1iGr9TXj?quantity=1`,
+}
+
+function getCheckoutUrl(plan: Plan): string | null {
+  if (!plan.dodoProductId) return null
+  return PRODUCT_CHECKOUT_URLS[plan.dodoProductId] ?? null
+}
+
+const TIER_COLORS: Record<string, string> = {
+  spark: "text-emerald-400 border-emerald-500/30",
+  "spark-premium": "text-cyan-400 border-cyan-500/30",
+  pro: "text-amber-400 border-amber-500/30",
+  ultra: "text-purple-400 border-purple-500/30",
+}
+
+const TIER_BG: Record<string, string> = {
+  spark: "bg-emerald-500/[0.03]",
+  "spark-premium": "bg-cyan-500/[0.03]",
+  pro: "bg-amber-500/[0.04]",
+  ultra: "bg-purple-500/[0.03]",
+}
+
+function BackgroundGlow() {
+  return (
+    <>
+      <div className="fixed inset-0 bg-[radial-gradient(ellipse_at_top,rgba(251,146,60,0.06)_0%,transparent_60%)]" />
+      <div className="fixed inset-0 bg-[linear-gradient(rgba(245,158,11,0.02)_1px,transparent_1px),linear-gradient(90deg,rgba(245,158,11,0.02)_1px,transparent_1px)] bg-[size:60px_60px] [mask-image:radial-gradient(ellipse_60%_60%_at_50%_40%,black_30%,transparent_100%)] pointer-events-none" />
+      <div className="fixed inset-0 bg-[radial-gradient(circle_at_center,transparent_0%,rgba(0,0,0,0.6)_100%)] pointer-events-none" />
+    </>
+  )
+}
+
+function getFeatures(tier: string) {
+  if (tier === "spark") return [
+    { label: "Open models only", included: true },
+    { label: "16K context window", included: true },
+    { label: "~10K requests/month", included: true },
+    { label: "Standard token limits", included: true },
+    { label: "$5 monthly credits + deals", included: true },
+    { label: "Memory (cross-session)", included: false },
+    { label: "Merge.dev Agent Handler", included: false },
+    { label: "Priority access", included: false },
+  ]
+  if (tier === "spark-premium") return [
+    { label: "Open models only", included: true },
+    { label: "32K context window", included: true },
+    { label: "~15K requests/month (resets)", included: true },
+    { label: "Standard token limits", included: true },
+    { label: "$10 monthly credits + deals", included: true },
+    { label: "Memory (cross-session)", included: false },
+    { label: "Merge.dev Agent Handler", included: false },
+    { label: "Priority access", included: false },
+  ]
+  if (tier === "pro") return [
+    { label: "Open-source + premium models", included: true },
+    { label: "128K context window", included: true },
+    { label: "~25K requests/month", included: true },
+    { label: "Higher token limits", included: true },
+    { label: "Usage analytics", included: true },
+    { label: "Memory (cross-session)", included: true },
+    { label: "Merge.dev Agent Handler", included: true },
+    { label: "Priority access", included: true },
+  ]
+  return [
+    { label: "All models (unrestricted)", included: true },
+    { label: "1M context window", included: true },
+    { label: "~110K requests/month", included: true },
+    { label: "Maximum token limits", included: true },
+    { label: "Highest rate limits", included: true },
+    { label: "Usage analytics", included: true },
+    { label: "Priority support", included: true },
+    { label: "99.9% availability SLA", included: true },
+  ]
+}
+
+function StatBadge({ label, value }: { label: string; value: string }) {
+  return (
+    <div className="rounded-lg bg-zinc-800/50 border border-zinc-700/50 px-3 py-2">
+      <div className="text-[10px] font-mono text-zinc-500 uppercase tracking-wider mb-0.5">{label}</div>
+      <div className="text-[12px] font-mono text-zinc-300">{value}</div>
+    </div>
+  )
+}
+
+function PlanLimitBar({ used, limit }: { used: number; limit: number }) {
+  const pct = Math.min(100, Math.round((used / limit) * 100))
+  const color = pct > 90 ? "bg-red-500" : pct > 70 ? "bg-amber-500" : "bg-cyan-500"
+  return (
+    <div>
+      <div className="flex items-center justify-between mb-1">
+        <span className="text-[11px] text-zinc-500 font-mono">Requests used</span>
+        <span className="text-[11px] font-mono text-zinc-400">
+          {used.toLocaleString()} / {limit.toLocaleString()} ({pct}%)
+        </span>
+      </div>
+      <div className="w-full h-1.5 bg-zinc-800 rounded-full overflow-hidden">
+        <div className={`h-full rounded-full ${color} transition-all duration-500`} style={{ width: `${pct}%` }} />
+      </div>
+    </div>
+  )
+}
+
+function CreditMeter({ balance }: { balance: CreditBalance }) {
+  const pct = Math.min(100, Math.round((balance.balanceCents / Math.max(balance.totalCredits, 1)) * 100))
+  return (
+    <div>
+      <div className="flex items-center justify-between mb-1">
+        <span className="text-[11px] text-zinc-500 font-mono">Credits remaining</span>
+        <span className="text-[11px] font-mono text-zinc-400">
+          ${(balance.balanceCents / 100).toFixed(2)} / ${(balance.totalCredits / 100).toFixed(2)} ({pct}%)
+        </span>
+      </div>
+      <div className="w-full h-1.5 bg-zinc-800 rounded-full overflow-hidden">
+        <div className="h-full rounded-full bg-cyan-500 transition-all duration-500" style={{ width: `${pct}%` }} />
+      </div>
+    </div>
+  )
+}
+
+function formatPrice(plan: Plan): string {
+  if (plan.currency === "INR") {
+    return `₹${(plan.priceCents / 100).toLocaleString("en-IN")}`
+  }
+  return `$${(plan.priceCents / 100).toFixed(0)}`
+}
+
+/** Resolve the regional variant (India vs international) from the browser locale. */
+function detectVariant(): "in" | "int" {
+  if (typeof navigator === "undefined") return "int"
+  const region = navigator.language?.split("-")[1]?.toUpperCase()
+  return region === "IN" ? "in" : "int"
+}
+
+function getNextBillingDate(interval: string | null): string {
+  const d = new Date()
+  if (interval === "year") {
+    d.setFullYear(d.getFullYear() + 1)
+  } else {
+    d.setMonth(d.getMonth() + 1)
+  }
+  return d.toLocaleDateString("en-US", { month: "long", day: "numeric", year: "numeric" })
+}
+
+function StudioPage() {
+  const { data: session, isPending: sessionLoading } = authClient.useSession()
+  const router = useRouter()
+  const searchParams = useSearchParams()
+
+  const [plans, setPlans] = useState<Plan[]>([])
+  const [subscription, setSubscription] = useState<SubscriptionInfo | null>(null)
+  const [currentPlan, setCurrentPlan] = useState<Plan | null>(null)
+  const [creditBalance, setCreditBalance] = useState<CreditBalance | null>(null)
+  const [requestsUsed, setRequestsUsed] = useState(0)
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState<string | null>(null)
+  const [cancelOpen, setCancelOpen] = useState(false)
+  const [cancelling, setCancelling] = useState(false)
+  const [refunding, setRefunding] = useState(false)
+  const [confirmingPlan, setConfirmingPlan] = useState<Plan | null>(null)
+
+  const userId = session?.user?.id
+
+  useEffect(() => {
+    if (!sessionLoading && !session?.session) {
+      router.replace(`/sign-in?redirect=${encodeURIComponent("/studio")}`)
+    }
+  }, [session, sessionLoading, router])
+
+  // Surface success/cancelled from the Dodo return/cancel URL
+  useEffect(() => {
+    if (searchParams.get("success")) toast.success("Checkout complete — welcome aboard!")
+    if (searchParams.get("cancelled")) toast.info("Checkout cancelled")
+  }, [searchParams, toast])
+
+  // Auto-scroll to / highlight the plan requested via ?plan= (from /pricing)
+  useEffect(() => {
+    const requested = searchParams.get("plan")
+    if (!requested) return
+    if (!loading && plans.length > 0) {
+      const target = document.getElementById(`plan-card-${requested}`)
+      if (target) {
+        target.scrollIntoView({ behavior: "smooth", block: "center" })
+        target.classList.add("ring-2", "ring-amber-500/60")
+        setTimeout(() => target.classList.remove("ring-2", "ring-amber-500/60"), 2500)
+      }
+    }
+  }, [searchParams, plans, loading])
+
+  const fetchData = useCallback(async () => {
+    if (!userId) return
+    try {
+      setError(null)
+      const variant = detectVariant()
+      const [plansRes, statusRes] = await Promise.all([
+        fetch(`/api/billing/plans?isGrandfathered=true&variant=${variant}`),
+        fetch(`/api/billing/status?userId=${encodeURIComponent(userId)}`),
+      ])
+      if (!plansRes.ok) throw new Error(`Plans API: ${plansRes.status}`)
+      if (!statusRes.ok) throw new Error(`Status API: ${statusRes.status}`)
+      const plansData = await plansRes.json()
+      const statusData = await statusRes.json()
+      setPlans(plansData.plans ?? [])
+      setSubscription(statusData.subscription ?? null)
+      setCurrentPlan(statusData.plan ?? null)
+      setCreditBalance(statusData.creditBalance ?? null)
+      setRequestsUsed(statusData.requestsUsed ?? 0)
+    } catch (err) {
+      setError(String(err))
+    } finally {
+      setLoading(false)
+    }
+  }, [userId])
+
+  useEffect(() => {
+    if (userId) fetchData()
+  }, [userId, fetchData])
+
+  const currentTier = currentPlan?.tier ?? "spark"
+  const isGrandfathered = subscription?.isGrandfathered ?? false
+
+  const handleConfirmPayNow = useCallback(async () => {
+    if (!confirmingPlan || !userId) return
+    const url = getCheckoutUrl(confirmingPlan)
+    if (url) {
+      window.location.href = url
+    } else {
+      setConfirmingPlan(null)
+      toast.error("Checkout URL not available for this plan")
+    }
+  }, [confirmingPlan, userId])
+
+  const handleCancel = useCallback(async () => {
+    if (!userId) return
+    setCancelling(true)
+    try {
+      const res = await fetch(`/api/billing/status?userId=${encodeURIComponent(userId)}`, {
+        method: "DELETE",
+      })
+      const data = await res.json()
+      if (!res.ok) throw new Error(data.error ?? "Failed to cancel subscription")
+      toast.success(data.message ?? "Subscription cancelled")
+      setCancelOpen(false)
+      await fetchData()
+    } catch (err) {
+      toast.error(err instanceof Error ? err.message : "Cancel failed")
+    } finally {
+      setCancelling(false)
+    }
+  }, [userId, fetchData])
+
+  const handleRefund = useCallback(async () => {
+    if (!userId) return
+    setRefunding(true)
+    try {
+      const res = await fetch("/api/billing/refund", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ userId }),
+      })
+      const data = await res.json()
+      if (!res.ok) throw new Error(data.error ?? data.message ?? "Refund request failed")
+      toast.success(data.message ?? "Refund initiated")
+      await fetchData()
+    } catch (err) {
+      toast.error(err instanceof Error ? err.message : "Refund failed")
+    } finally {
+      setRefunding(false)
+    }
+  }, [userId, fetchData])
+
+  const handlePortal = useCallback(async () => {
+    if (!userId) return
+    try {
+      const res = await fetch("/api/billing/status", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ userId, action: "portal" }),
+      })
+      const data = await res.json()
+      if (!res.ok) throw new Error(data.error ?? "Failed to get portal link")
+      if (data.url) window.open(data.url, "_blank", "noopener,noreferrer")
+    } catch (err) {
+      toast.error(err instanceof Error ? err.message : "Failed to open portal")
+    }
+  }, [userId])
+
+  if (sessionLoading || (!session?.session && !loading)) {
+    return (
+      <div className="flex items-center justify-center min-h-screen bg-zinc-950">
+        <Spinner className="size-8 text-amber-500" />
+      </div>
+    )
+  }
+
+  const upgradePlans = plans.filter(
+    (p) => p.tier !== currentTier && p.tier !== "spark",
+  )
+  const sparkPremiumPlan = plans.find((p) => p.tier === "spark-premium")
+
+  return (
+    <div className="relative min-h-screen bg-zinc-950 overflow-hidden">
+      <BackgroundGlow />
+
+      <div className="relative z-10 max-w-3xl mx-auto px-4 py-12">
+        {/* Header */}
+        <div className="flex items-center justify-between mb-8">
+          <div>
+            <span className="font-mono text-[10px] tracking-[0.25em] text-amber-500/40 uppercase">
+              Billing Studio
+            </span>
+            <h1 className="text-2xl font-semibold text-zinc-100 mt-1 tracking-tight">
+              Your Plan & Usage
+            </h1>
+          </div>
+          <div className="flex items-center gap-2">
+            <Button variant="ghost" size="sm" onClick={fetchData} className="text-zinc-500">
+              <RefreshCw className="size-3.5" />
+            </Button>
+            <Button variant="ghost" size="sm" asChild>
+              <a href="/">
+                <ArrowUpRight className="size-3.5" />
+                Dashboard
+              </a>
+            </Button>
+          </div>
+        </div>
+
+        {loading ? (
+          <div className="flex justify-center py-24">
+            <Spinner className="size-6 text-amber-500" />
+          </div>
+        ) : error ? (
+          <Card className="border-red-500/30 bg-red-500/[0.03]">
+            <CardContent className="p-6">
+              <div className="flex items-center gap-3">
+                <AlertTriangle className="size-5 text-red-400 shrink-0" />
+                <div>
+                  <p className="text-sm text-red-300 font-medium">Failed to load billing data</p>
+                  <p className="text-xs text-zinc-500 mt-0.5 font-mono">{error}</p>
+                </div>
+              </div>
+              <Button variant="outline" size="sm" onClick={fetchData} className="mt-4">
+                <RefreshCw className="size-3 mr-1" /> Retry
+              </Button>
+            </CardContent>
+          </Card>
+        ) : (
+          <div className="space-y-6">
+            {/* Current plan card */}
+            <Card className={`border ${TIER_COLORS[currentTier] || "border-zinc-800"} ${TIER_BG[currentTier] || "bg-zinc-900/40"} backdrop-blur-xl`}>
+              <CardContent className="p-6">
+                <div className="flex items-start justify-between mb-4">
+                  <div>
+                    <div className="flex items-center gap-2 mb-1">
+                      <h2 className="text-lg font-semibold text-zinc-100">
+                        {currentPlan?.name ?? "No active plan"}
+                      </h2>
+                      <Badge variant="outline" className="text-[10px] font-mono text-zinc-500 border-zinc-700">
+                        {subscription?.status ?? "none"}
+                      </Badge>
+                      {isGrandfathered && (
+                        <Badge variant="outline" className="text-[10px] font-mono text-emerald-500 border-emerald-500/30">
+                          Grandfathered
+                        </Badge>
+                      )}
+                    </div>
+                    <p className="text-[13px] text-zinc-500">
+                      {currentPlan?.description ?? "Subscribe to a plan to get started."}
+                    </p>
+                  </div>
+                  {subscription && (
+                    <Button variant="outline" size="sm" onClick={handlePortal} className="shrink-0">
+                      <ExternalLink className="size-3 mr-1" />
+                      Billing Portal
+                    </Button>
+                  )}
+                </div>
+
+                {/* Stats grid */}
+                <div className="grid grid-cols-2 md:grid-cols-4 gap-2 mb-5">
+                  <StatBadge label="Requests" value={`~${(currentPlan?.requestLimit ?? 10000).toLocaleString()}/mo`} />
+                  <StatBadge label="Context" value={`${(currentPlan?.contextLimit ?? 16384).toLocaleString()} tokens`} />
+                  <StatBadge label="Model access" value={currentPlan?.modelAccess === "all" ? "All models" : currentPlan?.modelAccess === "premium" ? "Open + Premium" : "Open models"} />
+                  <StatBadge label="Credits" value={currentPlan?.creditAmountCents ? `$${(currentPlan.creditAmountCents / 100).toFixed(0)}/mo` : "—"} />
+                </div>
+
+                {/* Request usage bar */}
+                <PlanLimitBar used={requestsUsed} limit={currentPlan?.requestLimit ?? 10000} />
+
+                {/* Credit balance */}
+                {creditBalance && (
+                  <div className="mt-4">
+                    <CreditMeter balance={creditBalance} />
+                    {creditBalance.resetAt && (
+                      <p className="text-[10px] text-zinc-600 font-mono mt-1">
+                        Resets {new Date(creditBalance.resetAt).toLocaleDateString()}
+                      </p>
+                    )}
+                  </div>
+                )}
+
+                {/* Features list */}
+                <div className="mt-5 pt-4 border-t border-zinc-800">
+                  <span className="text-[11px] font-mono text-zinc-500 uppercase tracking-wider mb-3 block">
+                    Plan features
+                  </span>
+                  <div className="grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-2">
+                    {getFeatures(currentTier).map((f) => (
+                      <div key={f.label} className="flex items-center gap-2 text-[12px]">
+                        {f.included ? (
+                          <CheckCircle2 className="size-3 text-emerald-500 shrink-0" />
+                        ) : (
+                          <span className="size-3 text-zinc-700 shrink-0 text-center">—</span>
+                        )}
+                        <span className={f.included ? "text-zinc-300" : "text-zinc-600"}>{f.label}</span>
+                      </div>
+                    ))}
+                  </div>
+                </div>
+
+                {/* Cancel button */}
+                {currentTier !== "spark" && (
+                  <div className="mt-5 pt-4 border-t border-zinc-800">
+                    <AlertDialog open={cancelOpen} onOpenChange={setCancelOpen}>
+                      <AlertDialogTrigger asChild>
+                        <Button variant="outline" size="sm" className="text-red-400 border-red-500/30 hover:bg-red-500/10">
+                          Cancel Subscription
+                        </Button>
+                      </AlertDialogTrigger>
+                      <AlertDialogContent>
+                        <AlertDialogHeader>
+                          <AlertDialogTitle>Cancel subscription?</AlertDialogTitle>
+                          <AlertDialogDescription>
+                            Your plan will remain active until the end of the billing period.
+                            {isGrandfathered
+                              ? " You will fall back to the free Spark plan (10K requests, 16K context)."
+                              : " Without a paid plan, you will need Spark Premium to keep using the CLI."}
+                          </AlertDialogDescription>
+                        </AlertDialogHeader>
+                        <AlertDialogFooter>
+                          <AlertDialogCancel>Keep Plan</AlertDialogCancel>
+                          <AlertDialogAction onClick={handleCancel} disabled={cancelling}>
+                            {cancelling ? <Loader2 className="size-3 animate-spin inline mr-1" /> : null}
+                            Confirm Cancel
+                          </AlertDialogAction>
+                        </AlertDialogFooter>
+                      </AlertDialogContent>
+                    </AlertDialog>
+                  </div>
+                )}
+              </CardContent>
+            </Card>
+
+            {/* Spark Premium upgrade card (Spark users only) */}
+            {currentTier === "spark" && sparkPremiumPlan && (
+              <Card id="plan-card-spark-premium" className="border-cyan-500/30 bg-cyan-500/[0.03] backdrop-blur-xl scroll-mt-24">
+                <CardContent className="p-6">
+                  <div className="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
+                    <div className="flex items-start gap-4">
+                      <div className="size-10 rounded-lg bg-cyan-500/10 border border-cyan-500/20 flex items-center justify-center shrink-0">
+                        <Zap className="size-5 text-cyan-400" />
+                      </div>
+                      <div>
+                        <div className="flex items-center gap-2 mb-1">
+                          <h3 className="text-[15px] font-semibold text-zinc-100 font-mono">Spark Premium</h3>
+                          <Badge variant="outline" className="text-[10px] font-mono text-cyan-400 border-cyan-500/30">
+                            Recommended
+                          </Badge>
+                        </div>
+                        <p className="text-[12px] text-zinc-500 leading-relaxed max-w-md">
+                          Upgrade for $1/month — unlock 15K requests, 32K context, and $10 monthly credits with deal multipliers.
+                        </p>
+                      </div>
+                    </div>
+                    <div className="flex items-center gap-4 shrink-0">
+                      <div className="text-right">
+                        <span className="text-xl font-semibold text-zinc-100">$1</span>
+                        <span className="text-[12px] text-zinc-500 font-mono">/month</span>
+                        <span className="text-[10px] text-zinc-600 font-mono block">+ processing fee</span>
+                      </div>
+                      <Button
+                        onClick={() => setConfirmingPlan(sparkPremiumPlan)}
+                        className="bg-cyan-600 hover:bg-cyan-500 text-white"
+                      >
+                        Upgrade
+                      </Button>
+                    </div>
+                  </div>
+
+                  {/* Mini stats */}
+                  <div className="grid grid-cols-3 gap-2 mt-4 pt-4 border-t border-cyan-500/10">
+                    <div className="text-center">
+                      <div className="text-[11px] font-mono text-cyan-400 font-medium">15K</div>
+                      <div className="text-[10px] text-zinc-500">Requests</div>
+                    </div>
+                    <div className="text-center">
+                      <div className="text-[11px] font-mono text-cyan-400 font-medium">32K</div>
+                      <div className="text-[10px] text-zinc-500">Context</div>
+                    </div>
+                    <div className="text-center">
+                      <div className="text-[11px] font-mono text-cyan-400 font-medium">$10</div>
+                      <div className="text-[10px] text-zinc-500">Credits</div>
+                    </div>
+                  </div>
+                </CardContent>
+              </Card>
+            )}
+
+            {/* No active plan → show sign-up prompt for new users */}
+            {!currentPlan && (
+              <Card className="border-zinc-800 bg-zinc-900/40 backdrop-blur-xl">
+                <CardContent className="p-6">
+                  <div className="flex items-start gap-4">
+                    <div className="size-10 rounded-lg bg-amber-500/10 border border-amber-500/20 flex items-center justify-center shrink-0">
+                      <Sparkles className="size-5 text-amber-400" />
+                    </div>
+                    <div>
+                      <h3 className="text-[15px] font-semibold text-zinc-100 font-mono">Get started with Spark Premium</h3>
+                      <p className="text-[12px] text-zinc-500 leading-relaxed mt-1">
+                        $1/month + processing fee — 15K requests, 32K context, $10 monthly credits, open models.
+                        Fully refundable if you use less than $5 of credits and 7.5K requests.
+                      </p>
+                    </div>
+                  </div>
+                </CardContent>
+              </Card>
+            )}
+
+            {/* Other plan options */}
+            {upgradePlans.length > 0 && (
+              <div>
+                <h3 className="text-[11px] font-mono text-zinc-500 uppercase tracking-wider mb-3">
+                  Available upgrades
+                </h3>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
+                  {upgradePlans.map((plan) => (
+                    <Card key={plan.id} id={`plan-card-${plan.tier}`} className="border-zinc-800 bg-zinc-900/40 backdrop-blur-xl scroll-mt-24">
+                      <CardContent className="p-5">
+                        <div className="flex items-start justify-between mb-3">
+                          <div>
+                            <h4 className="text-sm font-semibold text-zinc-100 font-mono">{plan.name}</h4>
+                            <p className="text-[11px] text-zinc-500 mt-0.5">{plan.description}</p>
+                          </div>
+                          <div className="text-right shrink-0">
+                            <span className="text-lg font-semibold text-zinc-100">
+                              {formatPrice(plan)}
+                            </span>
+                            <span className="text-[11px] text-zinc-500 font-mono">/{plan.interval}</span>
+                          </div>
+                        </div>
+                        <div className="grid grid-cols-2 gap-1 mb-3">
+                          <div className="text-[10px] text-zinc-500">
+                            <span className="block text-zinc-300 font-medium">{plan.requestLimit.toLocaleString()}</span>
+                            requests
+                          </div>
+                          <div className="text-[10px] text-zinc-500">
+                            <span className="block text-zinc-300 font-medium">{(plan.contextLimit / 1000).toFixed(0)}K</span>
+                            context
+                          </div>
+                        </div>
+                        <Button
+                          onClick={() => setConfirmingPlan(plan)}
+                          className="w-full text-[12px]"
+                          variant={plan.tier === "pro" ? "default" : "outline"}
+                          size="sm"
+                        >
+                          Subscribe to {plan.tier === "pro" ? "Pro" : "Ultra"}
+                        </Button>
+                      </CardContent>
+                    </Card>
+                  ))}
+                </div>
+              </div>
+            )}
+
+            {/* Refund section (Spark Premium only) */}
+            {currentTier === "spark-premium" && (
+              <Card className="border-zinc-800 bg-zinc-900/40 backdrop-blur-xl">
+                <CardContent className="p-5">
+                  <div className="flex items-start justify-between">
+                    <div className="flex items-start gap-3">
+                      <Shield className="size-5 text-zinc-500 shrink-0 mt-0.5" />
+                      <div>
+                        <h4 className="text-sm font-medium text-zinc-300">Request Refund</h4>
+                        <p className="text-[12px] text-zinc-600 mt-1 leading-relaxed">
+                          Refundable if credits consumed &lt; $5 and requests used &lt; 7.5K.
+                          Otherwise, refunds are handled on a case-by-case basis.
+                        </p>
+                      </div>
+                    </div>
+                    <Button
+                      variant="outline"
+                      size="sm"
+                      onClick={handleRefund}
+                      disabled={refunding}
+                      className="text-zinc-400 shrink-0"
+                    >
+                      {refunding ? <Loader2 className="size-3 animate-spin" /> : "Request Refund"}
+                    </Button>
+                  </div>
+                </CardContent>
+              </Card>
+            )}
+          </div>
+        )}
+      </div>
+
+      {/* Confirm checkout dialog */}
+      <Dialog open={!!confirmingPlan} onOpenChange={(open) => { if (!open) setConfirmingPlan(null) }}>
+        <DialogContent className="bg-zinc-900 border-zinc-700/50 max-w-md p-0">
+          <DialogHeader className="px-6 pt-6 pb-0">
+            <DialogTitle className="text-zinc-100 text-base font-semibold tracking-tight">
+              Confirm plan changes
+            </DialogTitle>
+          </DialogHeader>
+
+          {confirmingPlan && (
+            <div className="px-6 space-y-4">
+              {/* Plan + price */}
+              <div className="flex items-start justify-between">
+                <div>
+                  <span className="text-[15px] font-semibold text-zinc-100">{confirmingPlan.name}</span>
+                  <p className="text-[12px] text-zinc-500 mt-0.5">
+                    Billed {confirmingPlan.interval === "year" ? "yearly" : "monthly"}, starting today
+                  </p>
+                </div>
+                <span className="text-[15px] font-semibold text-zinc-100">{formatPrice(confirmingPlan)}</span>
+              </div>
+
+              {/* Dashed divider */}
+              <div className="border-t border-dashed border-zinc-700" />
+
+              {/* Due today */}
+              <div className="flex items-start justify-between">
+                <div>
+                  <span className="text-[14px] font-semibold text-zinc-100">Due today</span>
+                  <p className="text-[12px] text-zinc-500 mt-0.5">
+                    Your next billing date will be {getNextBillingDate(confirmingPlan.interval)}
+                  </p>
+                </div>
+                <span className="text-[14px] font-semibold text-zinc-100">{formatPrice(confirmingPlan)}</span>
+              </div>
+
+              {/* UPI note (INR only) */}
+              {confirmingPlan.currency === "INR" ? (
+                <p className="text-[11px] text-zinc-500 leading-relaxed">
+                  UPI auto-pay can't approve this charge on its own. After you click Pay now, you'll be redirected to enter your UPI PIN to authorise it.
+                </p>
+              ) : (
+                <p className="text-[11px] text-zinc-500 leading-relaxed">
+                  You'll be redirected to complete payment securely.
+                </p>
+              )}
+            </div>
+          )}
+
+          {/* Footer */}
+          <div className="flex items-center justify-end gap-2 px-6 pb-6 pt-2">
+            <DialogClose asChild>
+              <Button variant="ghost" size="sm" className="text-zinc-400 hover:text-zinc-200">
+                Cancel
+              </Button>
+            </DialogClose>
+            <Button
+              size="sm"
+              onClick={handleConfirmPayNow}
+              className="bg-white text-zinc-950 hover:bg-zinc-200 font-semibold"
+            >
+              Pay now
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
+    </div>
+  )
+}
+
+export default function StudioPageWrapper() {
+  return (
+    <Suspense
+      fallback={
+        <div className="flex items-center justify-center min-h-screen bg-zinc-950">
+          <Spinner className="size-8 text-amber-500" />
+        </div>
+      }
+    >
+      <StudioPage />
+    </Suspense>
+  )
+}
diff --git a/apps/supercode-cli/client/components/DodoPaymentsScript.tsx b/apps/supercode-cli/client/components/DodoPaymentsScript.tsx
new file mode 100644
index 0000000..73068db
--- /dev/null
+++ b/apps/supercode-cli/client/components/DodoPaymentsScript.tsx
@@ -0,0 +1,13 @@
+"use client"
+
+import Script from "next/script"
+
+export function DodoPaymentsScript() {
+  return (
+    <Script
+      src="https://checkout.dodopayments.com/sdk.js"
+      strategy="afterInteractive"
+      data-publishable-key={process.env.NEXT_PUBLIC_DODO_PUBLISHABLE_KEY}
+    />
+  )
+}
diff --git a/apps/supercode-cli/client/components/auth/login-form.tsx b/apps/supercode-cli/client/components/auth/login-form.tsx
index 4d83be1..0edc879 100644
--- a/apps/supercode-cli/client/components/auth/login-form.tsx
+++ b/apps/supercode-cli/client/components/auth/login-form.tsx
@@ -19,7 +19,9 @@ const LoginForm = () => {
 
   useEffect(() => {
     if (!isPending && data?.session) {
-      router.push("/")
+      const params = new URLSearchParams(window.location.search)
+      const redirect = params.get("redirect")
+      router.replace(redirect || "/")
     }
   }, [data, isPending, router])
 
diff --git a/apps/supercode-cli/client/next.config.ts b/apps/supercode-cli/client/next.config.ts
index c05257d..452d8ca 100644
--- a/apps/supercode-cli/client/next.config.ts
+++ b/apps/supercode-cli/client/next.config.ts
@@ -1,11 +1,23 @@
 import path from "path"
 import type { NextConfig } from "next"
 
+const API_SERVER = process.env.NEXT_PUBLIC_AUTH_URL ?? "http://localhost:3004"
+
 const nextConfig: NextConfig = {
   transpilePackages: ["@super/db-terminal", "@super/auth-terminal"],
   turbopack: {
     root: path.resolve(__dirname, "../../.."),
   },
+  async rewrites() {
+    // Dev-only proxies: `next dev` ignores vercel.json, so route the
+    // auth/billing API calls to the local CLI server. Production uses the
+    // vercel.json rewrites against the Render server.
+    return [
+      { source: "/api/auth/:path*", destination: `${API_SERVER}/api/auth/:path*` },
+      { source: "/api/billing/:path*", destination: `${API_SERVER}/api/billing/:path*` },
+      { source: "/api/webhooks/:path*", destination: `${API_SERVER}/api/webhooks/:path*` },
+    ]
+  },
 }
 
 export default nextConfig;
diff --git a/apps/supercode-cli/client/vercel.json b/apps/supercode-cli/client/vercel.json
index c9ec87b..8e10b24 100644
--- a/apps/supercode-cli/client/vercel.json
+++ b/apps/supercode-cli/client/vercel.json
@@ -5,6 +5,14 @@
     {
       "source": "/api/auth/:path*",
       "destination": "https://supercode-8w7e.onrender.com/api/auth/:path*"
+    },
+    {
+      "source": "/api/billing/:path*",
+      "destination": "https://supercode-8w7e.onrender.com/api/billing/:path*"
+    },
+    {
+      "source": "/api/webhooks/:path*",
+      "destination": "https://supercode-8w7e.onrender.com/api/webhooks/:path*"
     }
   ]
 }
diff --git a/apps/supercode-cli/server/.env.example b/apps/supercode-cli/server/.env.example
index 7eada24..856a419 100644
--- a/apps/supercode-cli/server/.env.example
+++ b/apps/supercode-cli/server/.env.example
@@ -25,6 +25,10 @@ CLIENT_URL="http://localhost:3000"
 # 🟡 GitHub OAuth — required to log in
 GITHUB_CLIENT_ID=""
 GITHUB_CLIENT_SECRET=""
+# ⚪ Override the GitHub OAuth redirect URI (defaults to
+# https://supercode-terminal.vercel.app/api/auth/callback/github in production).
+# Set for local dev if needed, or when the prod domain changes.
+GITHUB_REDIRECT_URI=""
 
 # ─── Server ────────────────────────────────────
 # ⚪ Port (defaults to 10000 if unset)
@@ -75,3 +79,15 @@ GOOGLE_CSE_ID=""
 
 # Firecrawl
 FIRECRAWL_API_KEY=""
+
+# ─── Dodo Payments ─────────────────────────────
+# 🟡 Required for paid-tier billing (checkout, webhooks, refunds)
+DODO_PAYMENTS_API_KEY=""
+DODO_PAYMENTS_WEBHOOK_KEY=""
+# ⚪ "test" to use test-mode product IDs in the seed; omit for live.
+DODO_MODE="test"
+# Where Dodo redirects after checkout (used by the checkout route)
+# Test: set to localhost or ngrok URL
+# Live: https://supercode-terminal.vercel.app/studio?success=true
+DODO_RETURN_URL="https://supercode-terminal.vercel.app/studio?success=true"
+DODO_CANCEL_URL="https://supercode-terminal.vercel.app/studio?cancelled=true"
diff --git a/apps/supercode-cli/server/package.json b/apps/supercode-cli/server/package.json
index def0002..c2f2f11 100644
--- a/apps/supercode-cli/server/package.json
+++ b/apps/supercode-cli/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "supercode-cli",
-  "version": "0.1.92",
+  "version": "0.1.93",
   "description": "AI-powered coding agent CLI",
   "main": "dist/main.js",
   "bin": {
@@ -22,6 +22,9 @@
     "dist/main.js",
     "README.md"
   ],
+  "prisma": {
+    "seed": "bun run prisma/seed.ts"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -45,6 +48,7 @@
     "@ai-sdk/mcp": "^2.0.10",
     "@ai-sdk/openai-compatible": "^2.0.48",
     "@composio/core": "^0.13.1",
+    "@dodopayments/nextjs": "^0.3.7",
     "@modelcontextprotocol/sdk": "^1.9.0",
     "@prisma/adapter-pg": "^7.8.0",
     "@prisma/client": "^7.8.0",
@@ -57,6 +61,7 @@
     "chalk": "^5.6.2",
     "commander": "^15.0.0",
     "cors": "^2.8.5",
+    "dodopayments": "^2.43.0",
     "eve": "^0.22.5",
     "express": "^5.1.0",
     "marked": "^18.0.4",
diff --git a/apps/supercode-cli/server/prisma/add-grandfather-users.ts b/apps/supercode-cli/server/prisma/add-grandfather-users.ts
new file mode 100644
index 0000000..f50f3e2
--- /dev/null
+++ b/apps/supercode-cli/server/prisma/add-grandfather-users.ts
@@ -0,0 +1,79 @@
+// apps/supercode-cli/server/prisma/add-grandfather-users.ts
+// Run: bun run prisma/add-grandfather-users.ts
+import { PrismaPg } from "@prisma/adapter-pg"
+import { PrismaClient } from "../src/generated"
+
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL_TERMINAL || process.env.DATABASE_URL,
+})
+
+const prisma = new PrismaClient({ adapter })
+
+async function main() {
+  console.log("Grandfathering existing users into Spark (Grandfathered)...")
+
+  const sparkPlan = await prisma.plan.findFirst({
+    where: { tier: "spark", active: true },
+  })
+
+  if (!sparkPlan) {
+    console.error("Spark (Grandfathered) plan not found. Run seed first.")
+    process.exit(1)
+  }
+
+  const users = await prisma.user.findMany({
+    where: {
+      subscriptions: { none: {} },
+    },
+  })
+
+  console.log(`Found ${users.length} users without subscriptions.`)
+
+  let count = 0
+  for (const user of users) {
+    const dodoSubId = `grandfathered-${user.id}-${Date.now()}`
+
+    await prisma.subscription.create({
+      data: {
+        userId: user.id,
+        planId: sparkPlan.id,
+        dodoSubscriptionId: dodoSubId,
+        status: "active",
+        metadata: { grandfathered: true },
+      },
+    })
+
+    const periodEnd = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000)
+    await prisma.creditBalance.upsert({
+      where: {
+        userId_planId: { userId: user.id, planId: sparkPlan.id },
+      },
+      update: {
+        balanceCents: 500,
+        totalCredits: 500,
+        resetAt: periodEnd,
+      },
+      create: {
+        userId: user.id,
+        planId: sparkPlan.id,
+        balanceCents: 500,
+        totalCredits: 500,
+        resetAt: periodEnd,
+      },
+    })
+
+    count++
+  }
+
+  console.log(`Grandfathered ${count} users into Spark (10K req, 16K ctx).`)
+}
+
+main()
+  .then(async () => {
+    await prisma.$disconnect()
+  })
+  .catch(async (e) => {
+    console.error(e)
+    await prisma.$disconnect()
+    process.exit(1)
+  })
diff --git a/apps/supercode-cli/server/prisma/seed.ts b/apps/supercode-cli/server/prisma/seed.ts
new file mode 100644
index 0000000..e5f7c0b
--- /dev/null
+++ b/apps/supercode-cli/server/prisma/seed.ts
@@ -0,0 +1,251 @@
+// apps/supercode-cli/server/prisma/seed.ts
+// Run: bun run prisma/seed.ts
+import "dotenv/config"
+import { PrismaPg } from "@prisma/adapter-pg"
+import { PrismaClient } from "../src/generated"
+
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL_TERMINAL || process.env.DATABASE_URL,
+})
+
+const prisma = new PrismaClient({ adapter })
+
+const isTest = process.env.DODO_MODE === "test"
+
+const DODO_PRODUCT_IDS = {
+  sparkPremium: isTest
+    ? "pdt_0Nk0u6EggnAdDxGtoLa1W"
+    : "pdt_0NkW4k2cUeO1f7a8yLje5",
+  proMonthlyIn: isTest
+    ? "pdt_0NkRjph71bwF2z3aBulCG"
+    : "pdt_0NkW59I3J7uy2m1j0RAOF",
+  proMonthlyInt: isTest
+    ? "pdt_0Nk0vS5WMtkT7u2T7P70e"
+    : "pdt_0NkW5Vvq7Uxw55sjMlDFe",
+  proYearlyIn: isTest
+    ? "pdt_0NkRm62YJBP043k9sEDab"
+    : "pdt_0NkW5s9M64jbHMoKrIpsl",
+  proYearlyInt: isTest
+    ? "pdt_0Nk0vwfI1kYrDaRsQzEUQ"
+    : "pdt_0NkW6PfRqqooJXIMaX4Ci",
+  ultraMonthly: isTest
+    ? "pdt_0NkRmfmsthQToUr41UAnd"
+    : "pdt_0NkW6cjti170KbFpeolfw",
+  ultraYearly: isTest
+    ? "pdt_0NkRmxBRNTOME3FYF9Qkg"
+    : "pdt_0NkW6tnjud9Sp1iGr9TXj",
+} as const
+
+console.log(`[seed] DODO_MODE=${process.env.DODO_MODE ?? "live"} — using ${isTest ? "test" : "live"} product IDs`)
+
+const PLANS = [
+  {
+    tier: "spark",
+    name: "Spark (Grandfathered)",
+    description: "Free plan for existing users — open models, standard limits.",
+    variant: null,
+    interval: null,
+    priceCents: 0,
+    currency: "USD",
+    requestLimit: 10000,
+    contextLimit: 16000,
+    modelAccess: "open",
+    creditAmountCents: 500,
+    dodoProductId: null,
+    sortOrder: 1,
+  },
+  {
+    tier: "spark-premium",
+    name: "Spark Premium",
+    description: "Open models, higher limits, $10 in monthly credits.",
+    variant: null,
+    interval: "month",
+    priceCents: 100,
+    currency: "USD",
+    requestLimit: 15000,
+    contextLimit: 32000,
+    modelAccess: "open",
+    creditAmountCents: 1000,
+    dodoProductId: DODO_PRODUCT_IDS.sparkPremium,
+    sortOrder: 2,
+  },
+  {
+    tier: "pro",
+    name: "Pro Monthly (India)",
+    description: "Premium models, 128K context, $30 in monthly credits.",
+    variant: "in",
+    interval: "month",
+    priceCents: 65900,
+    currency: "INR",
+    requestLimit: 25000,
+    contextLimit: 128000,
+    modelAccess: "premium",
+    creditAmountCents: 3000,
+    dodoProductId: DODO_PRODUCT_IDS.proMonthlyIn,
+    sortOrder: 3,
+  },
+  {
+    tier: "pro",
+    name: "Pro Monthly (International)",
+    description: "Premium models, 128K context, $30 in monthly credits.",
+    variant: "int",
+    interval: "month",
+    priceCents: 1200,
+    currency: "USD",
+    requestLimit: 25000,
+    contextLimit: 128000,
+    modelAccess: "premium",
+    creditAmountCents: 3000,
+    dodoProductId: DODO_PRODUCT_IDS.proMonthlyInt,
+    sortOrder: 4,
+  },
+  {
+    tier: "pro",
+    name: "Pro Yearly (India)",
+    description: "Premium models, 128K context, $30 in monthly credits.",
+    variant: "in",
+    interval: "year",
+    priceCents: 770000, // ₹7,700
+    currency: "INR",
+    requestLimit: 25000,
+    contextLimit: 128000,
+    modelAccess: "premium",
+    creditAmountCents: 3000,
+    dodoProductId: DODO_PRODUCT_IDS.proYearlyIn,
+    sortOrder: 5,
+  },
+  {
+    tier: "pro",
+    name: "Pro Yearly (International)",
+    description: "Premium models, 128K context, $30 in monthly credits.",
+    variant: "int",
+    interval: "year",
+    priceCents: 14000,
+    currency: "USD",
+    requestLimit: 25000,
+    contextLimit: 128000,
+    modelAccess: "premium",
+    creditAmountCents: 3000,
+    dodoProductId: DODO_PRODUCT_IDS.proYearlyInt,
+    sortOrder: 6,
+  },
+  {
+    tier: "ultra",
+    name: "Ultra Monthly",
+    description: "All models, 1M context, $150 in monthly credits.",
+    variant: null,
+    interval: "month",
+    priceCents: 10000,
+    currency: "USD",
+    requestLimit: 110000,
+    contextLimit: 1048576,
+    modelAccess: "all",
+    creditAmountCents: 15000,
+    dodoProductId: DODO_PRODUCT_IDS.ultraMonthly,
+    sortOrder: 7,
+  },
+  {
+    tier: "ultra",
+    name: "Ultra Yearly",
+    description: "All models, 1M context, $150 in monthly credits.",
+    variant: null,
+    interval: "year",
+    priceCents: 100000,
+    currency: "USD",
+    requestLimit: 110000,
+    contextLimit: 1048576,
+    modelAccess: "all",
+    creditAmountCents: 15000,
+    dodoProductId: DODO_PRODUCT_IDS.ultraYearly,
+    sortOrder: 8,
+  },
+]
+
+const MODELS = [
+  // ── Spark / Spark Premium (minTier: "spark") ──
+  { slug: "deepseek-v4-flash",         displayName: "DeepSeek V4 Flash",       provider: "deepseek",   minTier: "spark", inputPrice: 0.15,  outputPrice: 0.60,  cachedPrice: 0 },
+  { slug: "deepseek/deepseek-v4-flash", displayName: "DeepSeek V4 Flash (OR)",  provider: "openrouter", minTier: "spark", inputPrice: 0.15,  outputPrice: 0.60,  cachedPrice: 0 },
+  { slug: "MiniMax-M3",                displayName: "MiniMax M3",               provider: "minimax",    minTier: "spark", inputPrice: 0.20,  outputPrice: 0.80,  cachedPrice: 0.04 },
+  { slug: "mimo-v2.5",                displayName: "MiMo v2.5",                provider: "orcarouter", minTier: "spark", inputPrice: 0.15,  outputPrice: 0.60,  cachedPrice: 0 },
+  { slug: "kimi-k2-6",                 displayName: "Kimi K2.6",               provider: "openrouter", minTier: "spark", inputPrice: 0.15,  outputPrice: 0.60,  cachedPrice: 0 },
+  { slug: "kimi-k2-7-code",           displayName: "Kimi K2.7 Code",           provider: "openrouter", minTier: "spark", inputPrice: 0.25,  outputPrice: 1.00,  cachedPrice: 0 },
+  { slug: "kimi-k3",                   displayName: "Kimi K3",                  provider: "openrouter", minTier: "spark", inputPrice: 0.50,  outputPrice: 2.00,  cachedPrice: 0 },
+  { slug: "glm-5.2",                   displayName: "GLM 5.2",                 provider: "openrouter", minTier: "spark", inputPrice: 0.10,  outputPrice: 0.40,  cachedPrice: 0 },
+  { slug: "glm-5.1",                   displayName: "GLM 5.1",                 provider: "openrouter", minTier: "spark", inputPrice: 0.10,  outputPrice: 0.40,  cachedPrice: 0 },
+  { slug: "gemini-2.5-flash",          displayName: "Gemini 2.5 Flash",        provider: "google",     minTier: "spark", inputPrice: 0.15,  outputPrice: 0.60,  cachedPrice: 0.025 },
+  { slug: "meta/llama-3.3-70b-instruct", displayName: "Llama 3.3 70B",         provider: "openrouter", minTier: "spark", inputPrice: 0.59,  outputPrice: 0.99,  cachedPrice: 0 },
+  { slug: "orcarouter/auto",           displayName: "OrcaRouter Auto",         provider: "orcarouter", minTier: "spark", inputPrice: 0,     outputPrice: 0,      cachedPrice: 0 },
+
+  // ── Pro (minTier: "pro") — premium models ──
+  { slug: "anthropic/claude-sonnet-4.6", displayName: "Claude Sonnet 4.6",     provider: "openrouter", minTier: "pro",   inputPrice: 3.00,  outputPrice: 15.00, cachedPrice: 0.30 },
+  { slug: "anthropic/claude-opus-4.7",   displayName: "Claude Opus 4.7",     provider: "openrouter", minTier: "pro",   inputPrice: 5.00,  outputPrice: 25.00, cachedPrice: 0.50 },
+  { slug: "anthropic/claude-opus-4-8",   displayName: "Claude Opus 4.8",     provider: "openrouter", minTier: "pro",   inputPrice: 5.00,  outputPrice: 25.00, cachedPrice: 0.50 },
+  { slug: "anthropic/claude-opus-4-7",   displayName: "Claude Opus 4.7 (alt)", provider: "openrouter", minTier: "pro",   inputPrice: 5.00,  outputPrice: 25.00, cachedPrice: 0.50 },
+  { slug: "openai/gpt-5.5",            displayName: "GPT 5.5",                 provider: "openrouter", minTier: "pro",   inputPrice: 5.00,  outputPrice: 30.00, cachedPrice: 0.50 },
+  { slug: "grok/grok-4-fast-reasoning", displayName: "Grok 4 Fast Reasoning",  provider: "openrouter", minTier: "pro",   inputPrice: 1.00,  outputPrice: 5.00,  cachedPrice: 0 },
+  { slug: "gemini-2.5-pro",            displayName: "Gemini 2.5 Pro",          provider: "google",     minTier: "pro",   inputPrice: 1.25,  outputPrice: 10.00, cachedPrice: 0.3125 },
+  { slug: "deepseek/deepseek-reasoner", displayName: "DeepSeek Reasoner",       provider: "openrouter", minTier: "pro",   inputPrice: 0.50,  outputPrice: 2.00,  cachedPrice: 0 },
+  { slug: "fireworks/nemotron-3-ultra-nvfp4", displayName: "Nemotron 3 Ultra", provider: "openrouter", minTier: "pro",   inputPrice: 0.60,  outputPrice: 2.40,  cachedPrice: 0.12 },
+
+  // ── Ultra (minTier: "ultra") — top-tier frontier models ──
+  { slug: "anthropic/claude-opus-5",   displayName: "Claude Opus 5",           provider: "openrouter", minTier: "ultra",  inputPrice: 5.00,  outputPrice: 25.00, cachedPrice: 0.50 },
+  { slug: "anthropic/claude-fable-5",  displayName: "Claude Fable 5",          provider: "openrouter", minTier: "ultra",  inputPrice: 10.00, outputPrice: 50.00, cachedPrice: 1.00 },
+  { slug: "minimax/minimax-m3.5",     displayName: "MiniMax M3.5",            provider: "minimax",    minTier: "ultra",  inputPrice: 0.25,  outputPrice: 1.00,  cachedPrice: 0 },
+]
+
+async function main() {
+  console.log("Seeding plans...")
+
+  for (const plan of PLANS) {
+    if (plan.dodoProductId) {
+      // Look up by stable key (tier + variant + interval) so switching
+      // DODO_MODE between test/live updates the same row instead of
+      // creating a duplicate.
+      const existing = await prisma.plan.findFirst({
+        where: {
+          tier: plan.tier,
+          variant: plan.variant ?? null,
+          interval: plan.interval ?? null,
+        },
+      })
+      if (existing) {
+        await prisma.plan.update({ where: { id: existing.id }, data: plan })
+      } else {
+        await prisma.plan.create({ data: plan })
+      }
+    } else {
+      const existing = await prisma.plan.findFirst({
+        where: { tier: "spark", name: "Spark (Grandfathered)" },
+      })
+      if (existing) {
+        await prisma.plan.update({ where: { id: existing.id }, data: plan })
+      } else {
+        await prisma.plan.create({ data: plan })
+      }
+    }
+  }
+
+  console.log(`Seeded ${PLANS.length} plans.`)
+
+  console.log("Seeding models...")
+
+  for (const model of MODELS) {
+    await prisma.model.upsert({
+      where: { slug: model.slug },
+      update: model,
+      create: model,
+    })
+  }
+
+  console.log(`Seeded ${MODELS.length} models.`)
+}
+
+main()
+  .then(async () => {
+    await prisma.$disconnect()
+  })
+  .catch(async (e) => {
+    console.error(e)
+    await prisma.$disconnect()
+    process.exit(1)
+  })
diff --git a/apps/supercode-cli/server/src/api/billing/checkout.ts b/apps/supercode-cli/server/src/api/billing/checkout.ts
new file mode 100644
index 0000000..8c33cff
--- /dev/null
+++ b/apps/supercode-cli/server/src/api/billing/checkout.ts
@@ -0,0 +1,94 @@
+import { Router } from "express"
+import prisma from "../../lib/prisma"
+import { DodoPayments } from "dodopayments"
+
+const router = Router()
+
+function getDodo(): DodoPayments | null {
+  const key = process.env.DODO_PAYMENTS_API_KEY
+  if (!key) return null
+  return new DodoPayments({ bearerToken: key })
+}
+
+function studioUrl(path: string): string {
+  const clientUrl = process.env.CLIENT_URL || "http://localhost:3000"
+  return `${clientUrl.replace(/\/$/, "")}${path}`
+}
+
+router.post("/", async (req, res) => {
+  try {
+    const userId = req.body.userId as string | undefined
+    const planId = req.body.planId as string | undefined
+    const variant = req.body.variant as string | undefined
+
+    if (!userId) {
+      res.status(401).json({ error: "Unauthorized" })
+      return
+    }
+
+    if (!planId) {
+      res.status(400).json({ error: "planId is required" })
+      return
+    }
+
+    const plan = await prisma.plan.findUnique({
+      where: { id: planId, active: true },
+    })
+
+    if (!plan) {
+      res.status(404).json({ error: "Plan not found" })
+      return
+    }
+
+    // Don't allow checkout for the grandfathered Spark plan (free, no Dodo product)
+    if (!plan.dodoProductId) {
+      res.status(400).json({ error: "This plan cannot be purchased" })
+      return
+    }
+
+    const dodo = getDodo()
+    if (!dodo) {
+      console.error("[billing/checkout] DODO_PAYMENTS_API_KEY not configured")
+      res.status(503).json({ error: "Payments are not configured yet" })
+      return
+    }
+
+    // Create or reuse a Dodo customer for this user
+    let dodoCustomerId: string | null = null
+    const user = await prisma.user.findUnique({ where: { id: userId } })
+    if (user?.dodoCustomerId) {
+      dodoCustomerId = user.dodoCustomerId
+    }
+
+    const resolvedVariant = variant ?? plan.variant
+
+    const customer: Record<string, unknown> = dodoCustomerId
+      ? { customer_id: dodoCustomerId }
+      : { email: user?.email ?? `${userId}@supercode.local`, name: user?.name ?? "Supercode User" }
+
+    const checkoutSession = await dodo.checkoutSessions.create({
+      product_cart: [{ product_id: plan.dodoProductId, quantity: 1 }],
+      customer: customer as never,
+      metadata: {
+        userId,
+        planId: plan.id,
+        tier: plan.tier,
+        variant: resolvedVariant ?? "global",
+      },
+      return_url:
+        process.env.DODO_RETURN_URL ?? studioUrl("/studio?success=true"),
+      cancel_url:
+        process.env.DODO_CANCEL_URL ?? studioUrl("/studio?cancelled=true"),
+    })
+
+    res.json({
+      checkout_url: checkoutSession.checkout_url,
+      session_id: checkoutSession.session_id,
+    })
+  } catch (error) {
+    console.error("[billing/checkout] Checkout creation failed:", error)
+    res.status(500).json({ error: "Failed to create checkout session" })
+  }
+})
+
+export default router
diff --git a/apps/supercode-cli/server/src/api/billing/plans.ts b/apps/supercode-cli/server/src/api/billing/plans.ts
new file mode 100644
index 0000000..f920743
--- /dev/null
+++ b/apps/supercode-cli/server/src/api/billing/plans.ts
@@ -0,0 +1,49 @@
+import { Router } from "express"
+import prisma from "../../lib/prisma"
+
+const router = Router()
+
+router.get("/", async (req, res) => {
+  try {
+    const isGrandfathered = req.query.isGrandfathered === "true"
+
+    const where: Record<string, unknown> = { active: true }
+
+    // Grandfathered users see all plans including Spark (Free)
+    // Non-grandfathered users see Spark Premium + Pro + Ultra (no free plan)
+    if (!isGrandfathered) {
+      where.tier = { not: "spark" }
+    }
+
+    // All regional variants (Indian + International) and null-variant plans
+    // (Spark Premium, Ultra) are always returned — the studio shows every plan.
+
+    const plans = await prisma.plan.findMany({
+      where,
+      orderBy: { sortOrder: "asc" },
+      select: {
+        id: true,
+        tier: true,
+        name: true,
+        description: true,
+        variant: true,
+        interval: true,
+        priceCents: true,
+        currency: true,
+        requestLimit: true,
+        contextLimit: true,
+        modelAccess: true,
+        creditAmountCents: true,
+        dodoProductId: true,
+        sortOrder: true,
+      },
+    })
+
+    res.json({ plans })
+  } catch (error) {
+    console.error("[billing/plans] Failed to fetch plans:", error)
+    res.status(500).json({ error: "Failed to fetch plans" })
+  }
+})
+
+export default router
diff --git a/apps/supercode-cli/server/src/api/billing/refund.ts b/apps/supercode-cli/server/src/api/billing/refund.ts
new file mode 100644
index 0000000..51274e7
--- /dev/null
+++ b/apps/supercode-cli/server/src/api/billing/refund.ts
@@ -0,0 +1,143 @@
+import { Router } from "express"
+import prisma from "../../lib/prisma"
+import { DodoPayments } from "dodopayments"
+
+const router = Router()
+
+function getDodo(): DodoPayments | null {
+  const key = process.env.DODO_PAYMENTS_API_KEY
+  if (!key) return null
+  return new DodoPayments({ bearerToken: key })
+}
+
+router.post("/", async (req, res) => {
+  try {
+    const userId = req.body.userId as string | undefined
+    if (!userId) {
+      res.status(400).json({ error: "userId is required" })
+      return
+    }
+
+    const subscription = await prisma.subscription.findFirst({
+      where: {
+        userId,
+        status: "active",
+        plan: { tier: "spark-premium" },
+      },
+      include: { plan: true },
+      orderBy: { createdAt: "desc" },
+    })
+
+    if (!subscription) {
+      res.json({ eligible: false, reason: "No active Spark Premium subscription found." })
+      return
+    }
+
+    // Credits consumed this period
+    const creditBalance = await prisma.creditBalance.findFirst({
+      where: { userId },
+      orderBy: { updatedAt: "desc" },
+    })
+    const creditsConsumed = creditBalance
+      ? Math.max(0, (creditBalance.totalCredits ?? 0) - (creditBalance.balanceCents ?? 0))
+      : 0
+
+    // Queries used this period
+    const startOfPeriod = subscription.currentPeriodStart ?? new Date()
+    const queriesUsed = await prisma.usageEvent.count({
+      where: {
+        userId,
+        createdAt: { gte: startOfPeriod },
+      },
+    })
+
+    const creditsUnderLimit = creditsConsumed < 500 // < $5 consumed
+    const queriesUnderLimit = queriesUsed < 7500 // < 50% of 15K
+
+    const eligible = creditsUnderLimit && queriesUnderLimit
+
+    if (!eligible) {
+      res.json({
+        eligible: false,
+        reason: creditsUnderLimit
+          ? `Exceeded query limit (${queriesUsed}/7500 used).`
+          : `Exceeded credit consumption ($${(creditsConsumed / 100).toFixed(2)}/$5.00 used).`,
+        creditsUsed: creditsConsumed,
+        queriesUsed,
+      })
+      return
+    }
+
+    // Cancel the subscription + refund the $1 via Dodo (if key + payment available)
+    let refunded = false
+
+    const dodo = getDodo()
+    if (dodo && !subscription.dodoSubscriptionId.startsWith("grandfathered-")) {
+      try {
+        // Find the payment for this subscription so we can refund it
+        const payments = await dodo.payments.list({
+          subscription_id: subscription.dodoSubscriptionId,
+          status: "succeeded",
+        })
+        const first = payments.items?.[0] ?? (payments as unknown as { data?: Array<{ payment_id: string }> }).data?.[0]
+        if (first) {
+          const paymentId =
+            (first as { payment_id?: string }).payment_id ??
+            (first as unknown as { id?: string }).id
+          if (paymentId) {
+            await dodo.refunds.create({
+              payment_id: paymentId,
+              reason: "Spark Premium $1 refund — under $5 credits and 7.5K queries",
+              metadata: { userId, subscriptionId: subscription.dodoSubscriptionId },
+            })
+            refunded = true
+          }
+        }
+      } catch (err) {
+        console.error("[billing/refund] Dodo refund failed:", err)
+      }
+    }
+
+    await prisma.subscription.update({
+      where: { id: subscription.id },
+      data: { status: "cancelled", cancelAtPeriodEnd: true },
+    })
+
+    // Fall back to grandfathered Spark if the user has one — reuse an existing
+    // active Spark sub instead of duplicating it.
+    const grandfatheredPlan = await prisma.plan.findFirst({
+      where: { tier: "spark", active: true },
+    })
+    if (grandfatheredPlan) {
+      const existingSpark = await prisma.subscription.findFirst({
+        where: { userId, planId: grandfatheredPlan.id, status: "active" },
+      })
+      if (!existingSpark) {
+        await prisma.subscription.create({
+          data: {
+            userId,
+            planId: grandfatheredPlan.id,
+            dodoSubscriptionId: `grandfathered-${userId}-${Date.now()}`,
+            status: "active",
+            metadata: { grandfathered: true, refunded: true },
+          },
+        })
+      }
+    }
+
+    res.json({
+      eligible: true,
+      refunded,
+      creditsUsed: creditsConsumed,
+      queriesUsed,
+      message: refunded
+        ? "Refund processed — you've been moved back to the free Spark plan."
+        : "Refund not processed — payments are not configured yet. Your subscription is cancelled and you're back on the free Spark plan.",
+    })
+  } catch (error) {
+    console.error("[billing/refund] Refund processing failed:", error)
+    res.status(500).json({ error: "Failed to process refund" })
+  }
+})
+
+export default router
diff --git a/apps/supercode-cli/server/src/api/billing/status.ts b/apps/supercode-cli/server/src/api/billing/status.ts
new file mode 100644
index 0000000..fb5f8ae
--- /dev/null
+++ b/apps/supercode-cli/server/src/api/billing/status.ts
@@ -0,0 +1,218 @@
+import { Router } from "express"
+import prisma from "../../lib/prisma"
+import { DodoPayments } from "dodopayments"
+
+const router = Router()
+
+function getDodo(): DodoPayments | null {
+  const key = process.env.DODO_PAYMENTS_API_KEY
+  if (!key) return null
+  return new DodoPayments({ bearerToken: key })
+}
+
+function studioUrl(path: string): string {
+  const clientUrl = process.env.CLIENT_URL || "http://localhost:3000"
+  return `${clientUrl.replace(/\/$/, "")}${path}`
+}
+
+const PLAN_SELECT = {
+  tier: true,
+  name: true,
+  requestLimit: true,
+  contextLimit: true,
+  modelAccess: true,
+  creditAmountCents: true,
+} as const
+
+async function getActiveSubscription(userId: string) {
+  const subscription = await prisma.subscription.findFirst({
+    where: {
+      userId,
+      status: { in: ["active", "trialing"] },
+    },
+    include: { plan: { select: PLAN_SELECT } },
+    orderBy: { createdAt: "desc" },
+  })
+  return subscription
+}
+
+async function getGrandfatheredFallback(userId: string) {
+  return prisma.subscription.findFirst({
+    where: {
+      userId,
+      plan: { tier: "spark" },
+      status: "active",
+    },
+    include: { plan: { select: PLAN_SELECT } },
+  })
+}
+
+function isGrandfathered(sub: { metadata: unknown }): boolean {
+  return (sub.metadata as Record<string, unknown> | null)?.grandfathered === true
+}
+
+// GET /api/billing/status?userId=... — subscription + credit balance + usage
+router.get("/", async (req, res) => {
+  try {
+    const userId = req.query.userId as string | undefined
+    if (!userId) {
+      res.status(400).json({ error: "userId is required" })
+      return
+    }
+
+    const subscription = await getActiveSubscription(userId)
+
+    const creditBalance = await prisma.creditBalance.findFirst({
+      where: { userId },
+      orderBy: { updatedAt: "desc" },
+      select: { balanceCents: true, totalCredits: true, resetAt: true },
+    })
+
+    // Monthly request usage (calendar month, matching request-counter)
+    const startOfMonth = new Date()
+    startOfMonth.setDate(1)
+    startOfMonth.setHours(0, 0, 0, 0)
+    const requestsUsed = await prisma.usageEvent.count({
+      where: { userId, createdAt: { gte: startOfMonth } },
+    })
+
+    if (!subscription) {
+      res.json({ subscription: null, plan: null, creditBalance: null, requestsUsed: 0 })
+      return
+    }
+
+    // Expired paid period → fall back to grandfathered Spark (never locked out)
+    if (
+      subscription.plan.tier !== "spark" &&
+      !isGrandfathered(subscription) &&
+      subscription.currentPeriodEnd &&
+      new Date() > subscription.currentPeriodEnd
+    ) {
+      const fallback = await getGrandfatheredFallback(userId)
+      if (fallback) {
+        res.json({
+          subscription: {
+            id: fallback.id,
+            status: fallback.status,
+            metadata: fallback.metadata,
+          },
+          plan: fallback.plan,
+          creditBalance: null,
+          requestsUsed,
+        })
+        return
+      }
+      res.json({ subscription: null, plan: null, creditBalance: null, requestsUsed })
+      return
+    }
+
+    res.json({
+      subscription: {
+        id: subscription.id,
+        status: subscription.status,
+        currentPeriodStart: subscription.currentPeriodStart,
+        currentPeriodEnd: subscription.currentPeriodEnd,
+        trialEndsAt: subscription.trialEndsAt,
+        cancelAtPeriodEnd: subscription.cancelAtPeriodEnd,
+        metadata: subscription.metadata,
+        isGrandfathered: isGrandfathered(subscription),
+      },
+      plan: subscription.plan,
+      creditBalance,
+      requestsUsed,
+    })
+  } catch (error) {
+    console.error("[billing/status] Failed to fetch subscription status:", error)
+    res.json({ subscription: null, plan: null, creditBalance: null, requestsUsed: 0 })
+  }
+})
+
+// POST /api/billing/status — { action: "portal" } → Dodo customer portal URL
+router.post("/", async (req, res) => {
+  try {
+    const userId = req.body.userId as string | undefined
+    if (!userId) {
+      res.status(400).json({ error: "userId is required" })
+      return
+    }
+
+    const { action } = req.body
+    if (action !== "portal") {
+      res.status(400).json({ error: "Unknown action" })
+      return
+    }
+
+    const user = await prisma.user.findUnique({ where: { id: userId } })
+    if (!user?.dodoCustomerId) {
+      res.status(404).json({ error: "No Dodo customer linked to this account" })
+      return
+    }
+
+    const dodo = getDodo()
+    if (!dodo) {
+      res.status(503).json({ error: "Payments are not configured yet" })
+      return
+    }
+
+    const session = await dodo.customers.customerPortal.create(user.dodoCustomerId, {
+      return_url:
+        process.env.DODO_RETURN_URL ?? studioUrl("/studio?portal=true"),
+    })
+
+    res.json({ url: session.link })
+  } catch (error) {
+    console.error("[billing/status] Portal creation failed:", error)
+    res.status(500).json({ error: "Failed to open billing portal" })
+  }
+})
+
+// DELETE /api/billing/status — cancel subscription (keep access until period end)
+router.delete("/", async (req, res) => {
+  try {
+    const userId = req.query.userId as string | undefined
+    if (!userId) {
+      res.status(400).json({ error: "userId is required" })
+      return
+    }
+
+    const subscription = await prisma.subscription.findFirst({
+      where: {
+        userId,
+        status: { in: ["active", "trialing"] },
+        plan: { tier: { not: "spark" } },
+      },
+      orderBy: { createdAt: "desc" },
+    })
+
+    if (!subscription) {
+      res.json({ ok: true, message: "No active paid subscription to cancel" })
+      return
+    }
+
+    // Cancel with Dodo if we have a real subscription id + key configured
+    const dodo = getDodo()
+    if (dodo && !subscription.dodoSubscriptionId.startsWith("grandfathered-")) {
+      try {
+        await dodo.subscriptions.update(subscription.dodoSubscriptionId, {
+          cancel_at_next_billing_date: true,
+          cancel_reason: "cancelled_by_customer",
+        })
+      } catch (err) {
+        console.error("[billing/status] Dodo cancel failed:", err)
+        // Continue — still mark locally so the user is never stuck
+      }
+    }
+
+    await prisma.subscription.update({
+      where: { id: subscription.id },
+      data: { cancelAtPeriodEnd: true },
+    })
+
+    res.json({ ok: true, message: "Subscription cancelled — access remains until end of period" })
+  } catch (error) {
+    console.error("[billing/status] Cancel failed:", error)
+    res.status(500).json({ error: "Failed to cancel subscription" })
+  }
+})
+
+export default router
diff --git a/apps/supercode-cli/server/src/api/billing/webhook.ts b/apps/supercode-cli/server/src/api/billing/webhook.ts
new file mode 100644
index 0000000..19c7595
--- /dev/null
+++ b/apps/supercode-cli/server/src/api/billing/webhook.ts
@@ -0,0 +1,393 @@
+import { Router } from "express"
+import prisma from "../../lib/prisma"
+import { DodoPayments } from "dodopayments"
+import { invalidateModelCache } from "../../lib/model-access"
+import type { Prisma } from "../../generated"
+
+const router = Router()
+
+function getDodo(): DodoPayments | null {
+  const key = process.env.DODO_PAYMENTS_API_KEY
+  const webhookKey = process.env.DODO_PAYMENTS_WEBHOOK_KEY
+  if (!key) return null
+  return new DodoPayments({ bearerToken: key, webhookKey })
+}
+
+// ── Event shapes (mirrors dodopayments SDK types) ──
+
+interface DodoSubscriptionEvent {
+  id: string
+  type: string
+  timestamp: string
+  data: {
+    subscription_id: string
+    product_id: string
+    status: string
+    customer: { customer_id: string }
+    metadata?: Record<string, unknown>
+    previous_billing_date?: string
+    next_billing_date?: string
+    trial_period_days?: number
+    cancel_at_next_billing_date?: boolean
+    [key: string]: unknown
+  }
+}
+
+interface DodoPaymentEvent {
+  id: string
+  type: string
+  timestamp: string
+  data: {
+    payment_id: string
+    subscription_id?: string
+    customer: { customer_id: string }
+    status: string
+    amount: number
+    currency: string
+    metadata?: Record<string, unknown>
+    [key: string]: unknown
+  }
+}
+
+interface DodoRefundEvent {
+  id: string
+  type: string
+  timestamp: string
+  data: {
+    refund_id: string
+    payment_id: string
+    status: string
+    amount?: number
+    currency?: string
+    reason?: string
+    customer?: { customer_id: string }
+    metadata?: Record<string, unknown>
+    [key: string]: unknown
+  }
+}
+
+function toDate(iso?: string): Date | null {
+  if (!iso) return null
+  const d = new Date(iso)
+  return isNaN(d.getTime()) ? null : d
+}
+
+async function resetCredits(userId: string, planId: string, amountCents: number, periodEnd: Date) {
+  await prisma.creditBalance.upsert({
+    where: { userId_planId: { userId, planId } },
+    update: {
+      balanceCents: amountCents,
+      totalCredits: amountCents,
+      resetAt: periodEnd,
+    },
+    create: {
+      userId,
+      planId,
+      balanceCents: amountCents,
+      totalCredits: amountCents,
+      resetAt: periodEnd,
+    },
+  })
+}
+
+async function handleSubscriptionActive(event: DodoSubscriptionEvent) {
+  const { data } = event
+  let userId = data.metadata?.userId as string | undefined
+  const plan = await prisma.plan.findFirst({
+    where: { dodoProductId: data.product_id },
+  })
+
+  if (!plan) {
+    console.warn("[webhook] Missing plan for subscription.active", {
+      productId: data.product_id,
+    })
+    return
+  }
+
+  // If checkout metadata didn't carry userId, recover from an existing local
+  // subscription for this dodoSubscriptionId (idempotent resend / re-activation).
+  if (!userId) {
+    const existing = await prisma.subscription.findFirst({
+      where: { dodoSubscriptionId: data.subscription_id },
+      select: { userId: true },
+    })
+    if (existing) {
+      userId = existing.userId
+      console.log(`[webhook] Recovered userId ${userId} from existing subscription`)
+    }
+  }
+
+  if (!userId) {
+    console.warn("[webhook] Missing userId for subscription.active", {
+      subscriptionId: data.subscription_id,
+      productId: data.product_id,
+    })
+    return
+  }
+
+  // Cancel any grandfathered or other active/trialing subscriptions when the
+  // user upgrades — a plan switch should never leave two active subs.
+  await prisma.subscription.updateMany({
+    where: {
+      userId,
+      status: { in: ["active", "trialing"] },
+      dodoSubscriptionId: { not: data.subscription_id },
+    },
+    data: { status: "cancelled" },
+  })
+
+  const customerId = data.customer?.customer_id ?? null
+  const periodStart = toDate(data.previous_billing_date)
+  const periodEnd = toDate(data.next_billing_date)
+
+  await prisma.subscription.upsert({
+    where: { dodoSubscriptionId: data.subscription_id },
+    update: {
+      status: "active",
+      planId: plan.id,
+      dodoCustomerId: customerId,
+      currentPeriodStart: periodStart,
+      currentPeriodEnd: periodEnd,
+      cancelAtPeriodEnd: data.cancel_at_next_billing_date ?? false,
+      metadata: data.metadata as Prisma.InputJsonValue | undefined,
+    },
+    create: {
+      userId,
+      planId: plan.id,
+      dodoSubscriptionId: data.subscription_id,
+      dodoCustomerId: customerId,
+      status: "active",
+      currentPeriodStart: periodStart,
+      currentPeriodEnd: periodEnd,
+      metadata: data.metadata as Prisma.InputJsonValue | undefined,
+    },
+  })
+
+  // Init / reset credit balance
+  if (plan.creditAmountCents > 0) {
+    const end = periodEnd ?? new Date(Date.now() + 30 * 24 * 60 * 60 * 1000)
+    await resetCredits(userId, plan.id, plan.creditAmountCents, end)
+  }
+
+  // Link the Dodo customer to the user
+  if (customerId) {
+    await prisma.user.update({
+      where: { id: userId },
+      data: { dodoCustomerId: customerId },
+    })
+  }
+
+  invalidateModelCache()
+}
+
+async function handleSubscriptionRenewed(event: DodoSubscriptionEvent) {
+  const { data } = event
+  const periodStart = toDate(data.previous_billing_date)
+  const periodEnd = toDate(data.next_billing_date)
+
+  await prisma.subscription.updateMany({
+    where: { dodoSubscriptionId: data.subscription_id },
+    data: {
+      status: "active",
+      currentPeriodStart: periodStart,
+      currentPeriodEnd: periodEnd,
+    },
+  })
+
+  // Reset credits on renewal
+  const sub = await prisma.subscription.findFirst({
+    where: { dodoSubscriptionId: data.subscription_id },
+    include: { plan: true },
+  })
+
+  if (sub && sub.plan.creditAmountCents > 0) {
+    const end = periodEnd ?? new Date(Date.now() + 30 * 24 * 60 * 60 * 1000)
+    await resetCredits(sub.userId, sub.planId, sub.plan.creditAmountCents, end)
+  }
+}
+
+async function handleSubscriptionUpdated(event: DodoSubscriptionEvent) {
+  const { data } = event
+  const plan = data.product_id
+    ? await prisma.plan.findFirst({ where: { dodoProductId: data.product_id } })
+    : null
+
+  const statusMap: Record<string, string> = {
+    active: "active",
+    on_hold: "paused",
+    cancelled: "cancelled",
+    expired: "expired",
+    failed: "failed",
+    pending: "pending",
+  }
+
+  const result = await prisma.subscription.updateMany({
+    where: { dodoSubscriptionId: data.subscription_id },
+    data: {
+      status: statusMap[data.status] ?? data.status,
+      planId: plan?.id,
+      dodoCustomerId: data.customer?.customer_id ?? undefined,
+      currentPeriodStart: toDate(data.previous_billing_date) ?? undefined,
+      currentPeriodEnd: toDate(data.next_billing_date) ?? undefined,
+      cancelAtPeriodEnd: data.cancel_at_next_billing_date ?? undefined,
+    },
+  })
+  if (result.count === 0) {
+    console.warn("[webhook] subscription.updated for unknown local subscription", {
+      subscriptionId: data.subscription_id,
+    })
+  }
+}
+
+async function handleSubscriptionPlanChanged(event: DodoSubscriptionEvent) {
+  const { data } = event
+  const plan = await prisma.plan.findFirst({
+    where: { dodoProductId: data.product_id },
+  })
+
+  if (plan) {
+    await prisma.subscription.updateMany({
+      where: { dodoSubscriptionId: data.subscription_id },
+      data: { planId: plan.id },
+    })
+    invalidateModelCache()
+  }
+}
+
+async function handleSubscriptionCancelled(event: DodoSubscriptionEvent) {
+  const { data } = event
+  await prisma.subscription.updateMany({
+    where: { dodoSubscriptionId: data.subscription_id },
+    data: { cancelAtPeriodEnd: true },
+  })
+}
+
+async function handleSubscriptionOnHold(event: DodoSubscriptionEvent) {
+  const { data } = event
+  await prisma.subscription.updateMany({
+    where: { dodoSubscriptionId: data.subscription_id },
+    data: { status: "paused" },
+  })
+}
+
+async function handleSubscriptionExpired(event: DodoSubscriptionEvent) {
+  const { data } = event
+  await prisma.subscription.updateMany({
+    where: { dodoSubscriptionId: data.subscription_id },
+    data: { status: "expired" },
+  })
+}
+
+async function handleSubscriptionFailed(event: DodoSubscriptionEvent) {
+  const { data } = event
+  console.error("[webhook] Subscription failed:", {
+    id: data.subscription_id,
+    customerId: data.customer?.customer_id,
+  })
+}
+
+async function handleRefundSucceeded(event: DodoRefundEvent) {
+  const { data } = event
+  console.log("[webhook] Refund succeeded:", {
+    refundId: data.refund_id,
+    paymentId: data.payment_id,
+    amount: data.amount,
+    currency: data.currency,
+  })
+
+  // Our /api/billing/refund attaches { userId, subscriptionId } to the refund metadata.
+  // `subscriptionId` there is the DODO subscription id (dodoSubscriptionId), not the
+  // local DB row id — so match on either field for robustness.
+  const userId = data.metadata?.userId as string | undefined
+  const dodoSubscriptionId = data.metadata?.subscriptionId as string | undefined
+
+  if (userId && dodoSubscriptionId) {
+    // Merge the refunded flag into the existing metadata (e.g. grandfathered: true)
+    const existing = await prisma.subscription.findFirst({
+      where: { userId, dodoSubscriptionId },
+      select: { id: true, metadata: true },
+    })
+    if (!existing) {
+      console.warn("[webhook] refund.succeeded for unknown subscription", {
+        userId,
+        dodoSubscriptionId,
+      })
+      return
+    }
+    await prisma.subscription.update({
+      where: { id: existing.id },
+      data: {
+        metadata: {
+          ...((existing.metadata as Record<string, unknown>) ?? {}),
+          refunded: true,
+        } as Prisma.InputJsonValue,
+      },
+    })
+    console.log(`[webhook] Marked subscription ${existing.id} as refunded`)
+  } else {
+    console.warn("[webhook] refund.succeeded without userId/subscriptionId metadata", {
+      refundId: data.refund_id,
+    })
+  }
+}
+
+async function handleRefundFailed(event: DodoRefundEvent) {
+  const { data } = event
+  console.error("[webhook] Refund failed:", {
+    refundId: data.refund_id,
+    paymentId: data.payment_id,
+    reason: data.reason,
+    userId: data.metadata?.userId,
+    subscriptionId: data.metadata?.subscriptionId,
+  })
+}
+
+const EVENT_HANDLERS: Record<string, (event: any) => Promise<void>> = {
+  "subscription.active": handleSubscriptionActive,
+  "subscription.renewed": handleSubscriptionRenewed,
+  "subscription.updated": handleSubscriptionUpdated,
+  "subscription.plan_changed": handleSubscriptionPlanChanged,
+  "subscription.cancelled": handleSubscriptionCancelled,
+  "subscription.on_hold": handleSubscriptionOnHold,
+  "subscription.expired": handleSubscriptionExpired,
+  "subscription.failed": handleSubscriptionFailed,
+  "payment.succeeded": async () => {},
+  "payment.failed": async () => {},
+  "refund.succeeded": handleRefundSucceeded,
+  "refund.failed": handleRefundFailed,
+}
+
+router.post("/", async (req, res) => {
+  try {
+    const body = typeof req.body === "string" ? req.body : JSON.stringify(req.body)
+
+    const dodo = getDodo()
+    if (!dodo) {
+      console.error("[webhook] Dodo keys not configured — cannot verify webhook")
+      res.status(503).json({ received: false })
+      return
+    }
+
+    // Throws if signature verification fails
+    const event = dodo.webhooks.unwrap(body, {
+      headers: req.headers as Record<string, string>,
+    }) as unknown as DodoSubscriptionEvent | DodoPaymentEvent
+
+    console.log(`[webhook] Received event: ${event.type}`)
+
+    const handler = EVENT_HANDLERS[event.type]
+    if (handler) {
+      await handler(event)
+      console.log(`[webhook] Handled event: ${event.type}`)
+    } else {
+      console.log(`[webhook] Unhandled event type: ${event.type}`)
+    }
+
+    res.json({ received: true })
+  } catch (error) {
+    console.error("[webhook] Error processing webhook:", error)
+    res.status(400).json({ received: false })
+  }
+})
+
+export default router
diff --git a/apps/supercode-cli/server/src/cli/ai/chat/chat.ts b/apps/supercode-cli/server/src/cli/ai/chat/chat.ts
index bfdcca9..46c903d 100644
--- a/apps/supercode-cli/server/src/cli/ai/chat/chat.ts
+++ b/apps/supercode-cli/server/src/cli/ai/chat/chat.ts
@@ -12,6 +12,26 @@ import {
 } from "src/lib/api-client.ts"
 import type { ModelMessage } from "ai"
 import { createProvider, type ModelProvider, type AIProvider } from "src/cli/ai/provider.ts"
+import { checkPlanGate } from "src/lib/plan-gate"
+
+/** Rough token estimate of the conversation context (chars / 4). */
+function estimateContextTokens(messages: ModelMessage[]): number {
+  try {
+    return Math.ceil(JSON.stringify(messages).length / 4)
+  } catch {
+    return 0
+  }
+}
+
+/** Loads the conversation transcript and estimates its token count. */
+async function loadContextTokens(conversationId: string): Promise<number> {
+  try {
+    const msgs = await getMessages(conversationId)
+    return estimateContextTokens(msgs as unknown as ModelMessage[])
+  } catch {
+    return 0
+  }
+}
 import {
   permissionManager,
   setCurrentAgent,
@@ -2040,9 +2060,15 @@ export async function chatLoop(
               messageCount++
               await addMessage(conversation.id, "user", triggerMsg)
               try {
-                const aiResult = await streamAIResponse(provider, conversation.id, conversation.mode, workspaceInfo, footer)
-                if (aiResult.aborted) {
-                  process.stdout.write(` ${chalk.hex(theme.muted)("response aborted")}\r\n\n`)
+                const totalTokens = await loadContextTokens(conversation.id)
+                const gate = await checkPlanGate(conversation.userId, provider.modelName, { totalTokens })
+                if (!gate.allowed) {
+                  process.stdout.write(`\r\n ${chalk.hex(theme.amber)("◆")} ${chalk.hex(theme.amber)(gate.message)}\r\n\n`)
+                } else {
+                  const aiResult = await streamAIResponse(provider, conversation.id, conversation.mode, workspaceInfo, footer)
+                  if (aiResult.aborted) {
+                    process.stdout.write(` ${chalk.hex(theme.muted)("response aborted")}\r\n\n`)
+                  }
                 }
               } catch (err: any) {
                 const msg = err.message || String(err)
@@ -2138,9 +2164,15 @@ export async function chatLoop(
             await trySetAutoTitle(conversation.id, result.message, messageCount)
           }
           try {
-            const aiResult = await streamAIResponse(provider, conversation.id, conversation.mode, workspaceInfo, footer)
-            if (aiResult.aborted) {
-              process.stdout.write(` ${chalk.hex(theme.muted)("response aborted")}\r\n\n`)
+            const totalTokens = await loadContextTokens(conversation.id)
+            const gate = await checkPlanGate(conversation.userId, provider.modelName, { totalTokens })
+            if (!gate.allowed) {
+              process.stdout.write(`\r\n ${chalk.hex(theme.amber)("◆")} ${chalk.hex(theme.amber)(gate.message)}\r\n\n`)
+            } else {
+              const aiResult = await streamAIResponse(provider, conversation.id, conversation.mode, workspaceInfo, footer)
+              if (aiResult.aborted) {
+                process.stdout.write(` ${chalk.hex(theme.muted)("response aborted")}\r\n\n`)
+              }
             }
             footer.renderLine()
           } catch (err: any) {
@@ -2214,6 +2246,13 @@ export async function chatLoop(
       }
 
       try {
+        const totalTokens = await loadContextTokens(conversation.id)
+        const gate = await checkPlanGate(conversation.userId, provider.modelName, { totalTokens })
+        if (!gate.allowed) {
+          process.stdout.write(`\r\n ${chalk.hex(theme.amber)("◆")} ${chalk.hex(theme.amber)(gate.message)}\r\n\n`)
+          footer.renderLine()
+          continue
+        }
         const result = await streamAIResponse(provider, conversation.id, conversation.mode, workspaceInfo, footer, fileContext)
 
         if (result.aborted) {
diff --git a/apps/supercode-cli/server/src/cli/commands/slashCommands/index.ts b/apps/supercode-cli/server/src/cli/commands/slashCommands/index.ts
index 928221a..893543f 100644
--- a/apps/supercode-cli/server/src/cli/commands/slashCommands/index.ts
+++ b/apps/supercode-cli/server/src/cli/commands/slashCommands/index.ts
@@ -50,6 +50,7 @@ export const COMMANDS = [
   { cmd: "/crisp-debt", desc: "Find [crisp:N] tagged shortcuts / deferred work" },
   { cmd: "/crisp-gain", desc: "Impact scoreboard — LOC, deps, simplification potential" },
   { cmd: "/crisp-help", desc: "Quick reference for crisp commands" },
+  { cmd: "/upgrade", desc: "Show upgrade options and open the billing studio" },
   { cmd: "/sk", desc: "Alias for /skills" },
 ]
 
@@ -160,6 +161,10 @@ const handlers: Record<string, (args: string) => Promise<SlashCommandResult>> =
     const { crispHelpCommand } = await import("./crisp-help.ts")
     return crispHelpCommand()
   },
+  upgrade: async () => {
+    const { upgradeCommand } = await import("./upgrade.ts")
+    return upgradeCommand()
+  },
   search: async (args) => ({ type: "message", message: chatify("search", args) }),
   scrape: async (args) => ({ type: "message", message: chatify("scrape", args) }),
   interact: async (args) => ({ type: "message", message: chatify("interact", args) }),
diff --git a/apps/supercode-cli/server/src/cli/commands/slashCommands/upgrade.ts b/apps/supercode-cli/server/src/cli/commands/slashCommands/upgrade.ts
new file mode 100644
index 0000000..33e9403
--- /dev/null
+++ b/apps/supercode-cli/server/src/cli/commands/slashCommands/upgrade.ts
@@ -0,0 +1,103 @@
+import chalk from "chalk"
+import open from "open"
+import prisma from "src/lib/prisma"
+import { getStoredToken } from "src/lib/token"
+import { theme, sectionHeader, heavyDivider } from "src/cli/utils/tui.ts"
+import type { SlashCommandResult } from "./index.ts"
+
+const STUDIO_URL =
+  process.env.SUPERCODE_STUDIO_URL ??
+  (process.env.CLIENT_URL
+    ? `${process.env.CLIENT_URL.replace(/\/$/, "")}/studio`
+    : "https://supercode-terminal.vercel.app/studio")
+
+export async function upgradeCommand(): Promise<SlashCommandResult> {
+  console.log()
+  console.log(heavyDivider())
+  console.log()
+  console.log(sectionHeader("Upgrade Options", { accent: "green" }))
+  console.log()
+
+  const token = await getStoredToken()
+  if (!token?.access_token) {
+    console.log(` ${chalk.hex(theme.muted)("Not authenticated. Run /login first.")}`)
+    console.log()
+    console.log(heavyDivider())
+    console.log()
+    return { type: "message", message: "Log in first — run /login" }
+  }
+
+  const session = await prisma.session.findUnique({
+    where: { token: token.access_token as string },
+    include: { user: true },
+  })
+  if (!session || session.expiresAt < new Date()) {
+    console.log(` ${chalk.hex(theme.muted)("Session expired. Please re-authenticate.")}`)
+    console.log()
+    console.log(heavyDivider())
+    console.log()
+    return { type: "message", message: "Session expired — run /login" }
+  }
+
+  // Detect current plan
+  const subscription = await prisma.subscription.findFirst({
+    where: {
+      userId: session.user.id,
+      status: { in: ["active", "trialing"] },
+    },
+    include: { plan: true },
+    orderBy: { createdAt: "desc" },
+  })
+
+  const currentTier = subscription?.plan?.tier ?? "none"
+  const isGrandfathered =
+    (subscription?.metadata as Record<string, unknown> | null)?.grandfathered === true
+
+  console.log(
+    ` ${chalk.hex(theme.muted)("Current plan:")}  ${chalk.bold(
+      currentTier === "none" ? "None" : subscription!.plan!.name,
+    )}${isGrandfathered ? chalk.hex(theme.greenDim)(" (grandfathered)") : ""}`,
+  )
+  console.log()
+
+  // Plan comparison
+  console.log(` ${chalk.hex(theme.amber)("Plan comparison:")}`)
+  console.log()
+  console.log(`   ${chalk.hex(theme.greenGlow)("Spark")}${" ".repeat(12)}${chalk.hex(theme.muted)("10K req · 16K ctx · $5 credits · Open models")}`)
+  console.log(`   ${chalk.hex(theme.greenGlow)("Spark Premium")}${" ".repeat(7)}${chalk.hex(theme.muted)("$1/mo · 15K req · 32K ctx · $10 credits")}`)
+  console.log(`   ${chalk.hex(theme.amber)("Pro")}${" ".repeat(15)}${chalk.hex(theme.muted)("25K req · 128K ctx · +Premium models")}`)
+  console.log(`   ${chalk.hex(theme.amber)("Ultra")}${" ".repeat(13)}${chalk.hex(theme.muted)("110K req · 1M ctx · All models")}`)
+  console.log()
+
+  // Upgrade path based on current tier
+  if (currentTier === "spark" && isGrandfathered) {
+    console.log(` ${chalk.hex(theme.greenGlow)("→")} ${chalk.hex(theme.greenDim)("Upgrade to Spark Premium for $1/month — 15K requests, 32K context, $10 credits.")}`)
+    console.log(` ${chalk.hex(theme.amber)("✦")} ${chalk.hex(theme.amber)("Or upgrade to Pro ($9-12/mo) for premium models and higher limits.")}`)
+  } else if (currentTier === "spark-premium") {
+    console.log(` ${chalk.hex(theme.amber)("✦")} ${chalk.hex(theme.amber)("Upgrade to Pro ($9-12/mo) for premium models, 128K context, and 25K requests.")}`)
+  } else if (currentTier === "pro") {
+    console.log(` ${chalk.hex(theme.amber)("✦")} ${chalk.hex(theme.amber)("Upgrade to Ultra ($100/mo) for all models, 1M context, and 110K requests.")}`)
+  } else if (currentTier === "none") {
+    console.log(` ${chalk.hex(theme.greenGlow)("✦")} ${chalk.hex(theme.greenGlow)("Subscribe to Spark Premium ($1/mo) to get started with 15K requests and 32K context.")}`)
+  } else {
+    // Spark free (non-grandfathered) — show all upgrade paths
+    console.log(` ${chalk.hex(theme.greenGlow)("→")} ${chalk.hex(theme.greenGlow)("Spark Premium")}  ${chalk.hex(theme.muted)("$1/mo — 15K req · 32K ctx · $10 credits")}`)
+    console.log(` ${chalk.hex(theme.amber)("→")} ${chalk.hex(theme.amber)("Pro")}  ${chalk.hex(theme.muted)("$9-12/mo — 25K req · 128K ctx · Premium models")}`)
+    console.log(` ${chalk.hex(theme.amber)("→")} ${chalk.hex(theme.amber)("Ultra")}  ${chalk.hex(theme.muted)("$100/mo — 110K req · 1M ctx · All models")}`)
+  }
+
+  console.log()
+  console.log(` ${chalk.hex(theme.muted)("Opening billing studio in your browser...")}`)
+  console.log()
+
+  try {
+    await open(STUDIO_URL)
+  } catch {
+    console.log(` ${chalk.hex(theme.muted)(`→ Visit ${STUDIO_URL} to manage your plan`)}`)
+  }
+
+  console.log(heavyDivider())
+  console.log()
+
+  return { type: "message", message: "Check the billing studio in your browser" }
+}
diff --git a/apps/supercode-cli/server/src/index.ts b/apps/supercode-cli/server/src/index.ts
index c460646..22abb9d 100644
--- a/apps/supercode-cli/server/src/index.ts
+++ b/apps/supercode-cli/server/src/index.ts
@@ -8,6 +8,12 @@ import { recordUsage } from "./lib/track-usage"
 import { computeCost } from "./lib/pricing"
 import { checkDailyTokenBudget } from "./lib/token-budget"
 import { registerAnalyticsRoutes } from "./routes/analytics"
+import plansRouter from "./api/billing/plans"
+import checkoutRouter from "./api/billing/checkout"
+import statusRouter from "./api/billing/status"
+import refundRouter from "./api/billing/refund"
+import webhookRouter from "./api/billing/webhook"
+import { checkPlanGate } from "./lib/plan-gate"
 import { transcribeAudio } from "./voice/speech"
 import { tmpdir } from "os"
 import { join } from "path"
@@ -126,6 +132,14 @@ app.use(
 
 registerAnalyticsRoutes(app, prisma)
 
+app.use("/api/billing/plans", plansRouter)
+app.use("/api/billing/checkout", checkoutRouter)
+app.use("/api/billing/status", statusRouter)
+app.use("/api/billing/refund", refundRouter)
+app.use("/api/billing/webhook", webhookRouter)
+// Alias so the Dodo dashboard's configured webhook URL works as documented in the plan
+app.use("/api/webhooks/dodo-payments", webhookRouter)
+
 app.get("/api/data/users/count", async (_req, res) => {
   try {
     const count = await prisma.user.count()
@@ -317,6 +331,13 @@ app.post("/api/ai/chat", async (req, res) => {
       return
     }
 
+    // Paid-tier enforcement: subscription → model access → request cap → credits
+    const gate = await checkPlanGate(user.id, modelParam ?? "deepseek-v4-flash")
+    if (!gate.allowed) {
+      res.status(403).json({ error: "plan_limit_exceeded", message: gate.message })
+      return
+    }
+
     const isByok = provider === "concentrateai" && !!req.body.concentrateAiKey
     if (!isByok) {
       await checkDailyTokenBudget(user.id)
diff --git a/apps/supercode-cli/server/src/lib/auth.ts b/apps/supercode-cli/server/src/lib/auth.ts
index 334f9b5..53245cf 100644
--- a/apps/supercode-cli/server/src/lib/auth.ts
+++ b/apps/supercode-cli/server/src/lib/auth.ts
@@ -22,12 +22,14 @@ export const auth = betterAuth({
     github: {
       clientId: process.env.GITHUB_CLIENT_ID as string,
       clientSecret: process.env.GITHUB_CLIENT_SECRET as string,
-      ...(isProduction
-        ? {
-            redirectURI:
-              "https://supercode-terminal.vercel.app/api/auth/callback/github",
-          }
-        : {}),
+      ...(process.env.GITHUB_REDIRECT_URI
+        ? { redirectURI: process.env.GITHUB_REDIRECT_URI }
+        : isProduction
+          ? {
+              redirectURI:
+                "https://supercode-terminal.vercel.app/api/auth/callback/github",
+            }
+          : {}),
     },
   },
   plugins: [
diff --git a/apps/supercode-cli/server/src/lib/context-enforcer.ts b/apps/supercode-cli/server/src/lib/context-enforcer.ts
new file mode 100644
index 0000000..c9d6672
--- /dev/null
+++ b/apps/supercode-cli/server/src/lib/context-enforcer.ts
@@ -0,0 +1,39 @@
+export type EnforcementAction = "warn" | "truncate" | "block"
+
+/**
+ * Enforces a plan's context-length limit (16K grandfathered, 32K Premium,
+ * 128K Pro, 1M Ultra). Defaults to truncation.
+ */
+export function enforceContextLimit(
+  totalTokens: number,
+  contextLimit: number,
+  action: EnforcementAction = "truncate",
+): {
+  allowed: boolean
+  truncatedTokens?: number
+  message?: string
+} {
+  if (totalTokens <= contextLimit) {
+    return { allowed: true }
+  }
+
+  if (action === "warn") {
+    return {
+      allowed: true,
+      message: `Warning: context (${totalTokens.toLocaleString()} tokens) exceeds your plan limit of ${contextLimit.toLocaleString()}. Run /upgrade.`,
+    }
+  }
+
+  if (action === "truncate") {
+    return {
+      allowed: true,
+      truncatedTokens: contextLimit,
+      message: `Context truncated to ${contextLimit.toLocaleString()} tokens (plan limit).`,
+    }
+  }
+
+  return {
+    allowed: false,
+    message: `Context of ${totalTokens.toLocaleString()} tokens exceeds your plan limit of ${contextLimit.toLocaleString()}. Run /upgrade.`,
+  }
+}
diff --git a/apps/supercode-cli/server/src/lib/credit-meter.ts b/apps/supercode-cli/server/src/lib/credit-meter.ts
new file mode 100644
index 0000000..ee0e633
--- /dev/null
+++ b/apps/supercode-cli/server/src/lib/credit-meter.ts
@@ -0,0 +1,82 @@
+import prisma from "./prisma"
+
+// Base credit cost per request in cents (matches the "Credit Burn Rates" table in the DDP plan)
+const MODEL_BASE_COST: Record<string, number> = {
+  "deepseek-v4-flash": 1.0, // $0.01
+  "deepseek/deepseek-v4-flash": 1.0,
+  "MiniMax-M3": 1.5, // $0.015
+  "minimax/minimax-m3": 1.5,
+  "mimo-v2.5": 5.0, // $0.05
+  "kimi-k2-6": 0.5, // $0.005 (other open models)
+  "kimi-k2-7-code": 0.5,
+  "kimi-k3": 0.5,
+  "glm-5.2": 0.5,
+  "glm-5.1": 0.5,
+  "gemini-2.5-flash": 0.5,
+  "hy3": 0.5,
+  "fireworks/nemotron-3-ultra-nvfp4": 0.5,
+}
+
+// Deal multipliers — stretch credits further on select models
+const MODEL_DEAL_MULTIPLIER: Record<string, number> = {
+  "deepseek-v4-flash": 4.0, // 4× = 75% less credit burn
+  "deepseek/deepseek-v4-flash": 4.0,
+  "MiniMax-M3": 2.7,
+  "minimax/minimax-m3": 2.7,
+  "mimo-v2.5": 100.0, // 99% off
+}
+
+/** Effective credit cost in cents for a model (base ÷ deal multiplier). */
+export function getCreditCost(model: string): number {
+  const base = MODEL_BASE_COST[model] ?? 1.0
+  const deal = MODEL_DEAL_MULTIPLIER[model] ?? 1.0
+  return Math.round((base / deal) * 100) / 100
+}
+
+/**
+ * Deducts credits for a request. Credits are a soft gate — if the balance is
+ * too low the request proceeds on the request-limit quota instead.
+ */
+export async function deductCredits(
+  userId: string,
+  model: string,
+): Promise<{ deducted: boolean; remainingCents: number }> {
+  try {
+    const cost = getCreditCost(model)
+
+    const balance = await prisma.creditBalance.findFirst({
+      where: { userId },
+      orderBy: { updatedAt: "desc" },
+    })
+
+    if (!balance || balance.balanceCents < cost) {
+      return { deducted: false, remainingCents: balance?.balanceCents ?? 0 }
+    }
+
+    await prisma.creditBalance.update({
+      where: { userId_planId: { userId: balance.userId, planId: balance.planId } },
+      data: { balanceCents: { decrement: cost } },
+    })
+
+    return { deducted: true, remainingCents: balance.balanceCents - cost }
+  } catch (error) {
+    console.error("[credit-meter] Failed to deduct credits:", error)
+    return { deducted: false, remainingCents: 0 }
+  }
+}
+
+export async function getCreditBalance(
+  userId: string,
+): Promise<{ balanceCents: number; totalCredits: number; resetAt: Date | null } | null> {
+  try {
+    const balance = await prisma.creditBalance.findFirst({
+      where: { userId },
+      orderBy: { updatedAt: "desc" },
+      select: { balanceCents: true, totalCredits: true, resetAt: true },
+    })
+    return balance ?? null
+  } catch (error) {
+    console.error("[credit-meter] Failed to fetch credit balance:", error)
+    return null
+  }
+}
diff --git a/apps/supercode-cli/server/src/lib/model-access.ts b/apps/supercode-cli/server/src/lib/model-access.ts
new file mode 100644
index 0000000..fa88926
--- /dev/null
+++ b/apps/supercode-cli/server/src/lib/model-access.ts
@@ -0,0 +1,58 @@
+import prisma from "./prisma"
+
+/** Ordered tier levels for comparison: higher index = more access */
+const TIER_ORDER = ["spark", "spark-premium", "pro", "ultra"] as const
+type Tier = (typeof TIER_ORDER)[number]
+
+let modelCache: Array<{ slug: string; minTier: string }> | null = null
+
+async function ensureCache(): Promise<Array<{ slug: string; minTier: string }>> {
+  if (!modelCache) {
+    modelCache = await prisma.model.findMany({
+      where: { active: true },
+      select: { slug: true, minTier: true },
+    })
+  }
+  return modelCache
+}
+
+export function tierIndex(tier: string): number {
+  const i = TIER_ORDER.indexOf(tier as Tier)
+  return i === -1 ? -1 : i
+}
+
+/**
+ * Checks whether a model slug is allowed for the user's plan tier.
+ * Model gating is backed by the `Model` table's `minTier` field.
+ */
+export async function isModelAllowedForTier(
+  modelSlug: string,
+  userTier: string,
+): Promise<boolean> {
+  try {
+    const models = await ensureCache()
+    const model = models.find(
+      (m) => m.slug === modelSlug || modelSlug.includes(m.slug),
+    )
+    if (!model) return false
+    return tierIndex(userTier) >= tierIndex(model.minTier)
+  } catch (error) {
+    console.error("[model-access] Failed to load model cache:", error)
+    return false
+  }
+}
+
+export function getUpgradeSuggestion(userTier: string): string {
+  if (tierIndex(userTier) < tierIndex("pro")) {
+    return "To access premium models, run /upgrade"
+  }
+  if (tierIndex(userTier) < tierIndex("ultra")) {
+    return "To access all models unrestricted, run /upgrade"
+  }
+  return ""
+}
+
+/** Invalidate cache when the Model table changes (e.g. after seeding) */
+export function invalidateModelCache(): void {
+  modelCache = null
+}
diff --git a/apps/supercode-cli/server/src/lib/plan-gate.ts b/apps/supercode-cli/server/src/lib/plan-gate.ts
new file mode 100644
index 0000000..5e466c8
--- /dev/null
+++ b/apps/supercode-cli/server/src/lib/plan-gate.ts
@@ -0,0 +1,83 @@
+import { getSubscriptionPlan } from "./subscription-check"
+import { isModelAllowedForTier, getUpgradeSuggestion } from "./model-access"
+import { checkRequestLimit } from "./request-counter"
+import { deductCredits } from "./credit-meter"
+import { enforceContextLimit } from "./context-enforcer"
+
+export interface PlanGateResult {
+  allowed: boolean
+  message?: string
+  plan?: {
+    tier: string
+    name: string
+    requestLimit: number
+    contextLimit: number
+    creditAmountCents: number
+    isGrandfathered: boolean
+  }
+  credits?: { deducted: boolean; remainingCents: number }
+}
+
+/**
+ * Enforcement gate run before each AI request:
+ *   1. Read the user's plan from the CLI server DB (no API call)
+ *   2. Check the monthly request cap (10K / 15K / 25K / 110K)
+ *   3. Check the model is allowed on the user's tier
+ *   4. Check context length ≤ tier limit (16K / 32K / 128K / 1M)
+ *   5. Deduct credits at the model's burn rate (soft gate — falls back to quota)
+ */
+export async function checkPlanGate(
+  userId: string,
+  modelName: string,
+  opts?: { totalTokens?: number },
+): Promise<PlanGateResult> {
+  const plan = await getSubscriptionPlan(userId)
+
+  if (!plan) {
+    return {
+      allowed: false,
+      message:
+        "You don't have an active subscription. Run /upgrade to subscribe to Spark Premium ($1/mo) and start using the CLI.",
+    }
+  }
+
+  // 2. Request cap — hard gate
+  const request = await checkRequestLimit(userId, plan.requestLimit)
+  if (!request.allowed) {
+    return { allowed: false, message: request.message }
+  }
+
+  // 3. Model gating — hard gate
+  const modelAllowed = await isModelAllowedForTier(modelName, plan.tier)
+  if (!modelAllowed) {
+    const suggestion = getUpgradeSuggestion(plan.tier)
+    return {
+      allowed: false,
+      message: `"${modelName}" is not available on your ${plan.name} plan. ${suggestion}`,
+    }
+  }
+
+  // 4. Context enforcement — truncate above plan limit
+  if (opts?.totalTokens) {
+    const ctx = enforceContextLimit(opts.totalTokens, plan.contextLimit)
+    if (!ctx.allowed) {
+      return { allowed: false, message: ctx.message }
+    }
+  }
+
+  // 5. Credits — soft gate (deduct if available, fall back to quota otherwise)
+  const credits = await deductCredits(userId, modelName)
+
+  return {
+    allowed: true,
+    plan: {
+      tier: plan.tier,
+      name: plan.name,
+      requestLimit: plan.requestLimit,
+      contextLimit: plan.contextLimit,
+      creditAmountCents: plan.creditAmountCents,
+      isGrandfathered: plan.isGrandfathered,
+    },
+    credits,
+  }
+}
diff --git a/apps/supercode-cli/server/src/lib/request-counter.ts b/apps/supercode-cli/server/src/lib/request-counter.ts
new file mode 100644
index 0000000..125693e
--- /dev/null
+++ b/apps/supercode-cli/server/src/lib/request-counter.ts
@@ -0,0 +1,49 @@
+import prisma from "./prisma"
+
+export async function getMonthlyRequestCount(userId: string): Promise<number> {
+  const startOfMonth = new Date()
+  startOfMonth.setDate(1)
+  startOfMonth.setHours(0, 0, 0, 0)
+
+  try {
+    const result = await prisma.usageEvent.aggregate({
+      where: {
+        userId,
+        createdAt: { gte: startOfMonth },
+      },
+      _count: { id: true },
+    })
+
+    return result._count.id
+  } catch (error) {
+    console.error("[request-counter] Failed to count requests:", error)
+    return 0
+  }
+}
+
+/**
+ * Checks whether the user is under their plan's monthly request cap
+ * (10K grandfathered, 15K Premium, 25K Pro, 110K Ultra).
+ */
+export async function checkRequestLimit(
+  userId: string,
+  requestLimit: number,
+): Promise<{
+  allowed: boolean
+  used: number
+  limit: number
+  message?: string
+}> {
+  const used = await getMonthlyRequestCount(userId)
+
+  if (used >= requestLimit) {
+    return {
+      allowed: false,
+      used,
+      limit: requestLimit,
+      message: `You've used ${used.toLocaleString()} of ${requestLimit.toLocaleString()} monthly requests. Run /upgrade.`,
+    }
+  }
+
+  return { allowed: true, used, limit: requestLimit }
+}
diff --git a/apps/supercode-cli/server/src/lib/subscription-check.ts b/apps/supercode-cli/server/src/lib/subscription-check.ts
new file mode 100644
index 0000000..9f5c0c4
--- /dev/null
+++ b/apps/supercode-cli/server/src/lib/subscription-check.ts
@@ -0,0 +1,82 @@
+import prisma from "./prisma"
+
+export interface PlanInfo {
+  tier: "spark" | "spark-premium" | "pro" | "ultra"
+  name: string
+  requestLimit: number
+  contextLimit: number
+  modelAccess: "open" | "premium" | "all"
+  creditAmountCents: number
+  isGrandfathered: boolean
+  currentPeriodEnd: Date | null
+}
+
+function isGrandfathered(sub: { metadata: unknown }): boolean {
+  return (sub.metadata as Record<string, unknown> | null)?.grandfathered === true
+}
+
+/**
+ * Reads the user's active subscription plan directly from the CLI server DB.
+ * Grandfathered users always fall back to Spark (10K/16K) — never fully locked.
+ * Returns null if the user has no active subscription (new user without a plan).
+ */
+export async function getSubscriptionPlan(userId: string): Promise<PlanInfo | null> {
+  try {
+    const subscription = await prisma.subscription.findFirst({
+      where: {
+        userId,
+        status: { in: ["active", "trialing"] },
+      },
+      include: { plan: true },
+      orderBy: { createdAt: "desc" },
+    })
+
+    if (!subscription?.plan) return null
+
+    const grandfathered = isGrandfathered(subscription)
+
+    // Paid plans expire at period end; grandfathered Spark never expires
+    if (
+      !grandfathered &&
+      subscription.plan.tier !== "spark" &&
+      subscription.currentPeriodEnd &&
+      new Date() > subscription.currentPeriodEnd
+    ) {
+      const fallback = await prisma.subscription.findFirst({
+        where: {
+          userId,
+          plan: { tier: "spark" },
+          status: "active",
+        },
+        include: { plan: true },
+      })
+      if (fallback?.plan) {
+        return {
+          tier: "spark",
+          name: fallback.plan.name,
+          requestLimit: fallback.plan.requestLimit,
+          contextLimit: fallback.plan.contextLimit,
+          modelAccess: "open",
+          creditAmountCents: fallback.plan.creditAmountCents,
+          isGrandfathered: true,
+          currentPeriodEnd: fallback.currentPeriodEnd,
+        }
+      }
+      return null
+    }
+
+    return {
+      tier: subscription.plan.tier as PlanInfo["tier"],
+      name: subscription.plan.name,
+      requestLimit: subscription.plan.requestLimit,
+      contextLimit: subscription.plan.contextLimit,
+      modelAccess: subscription.plan.modelAccess as PlanInfo["modelAccess"],
+      creditAmountCents: subscription.plan.creditAmountCents,
+      isGrandfathered: grandfathered,
+      currentPeriodEnd: subscription.currentPeriodEnd,
+    }
+  } catch (error) {
+    console.error("[subscription-check] DB error:", error)
+    return null
+  }
+}
diff --git a/apps/web/.env.example b/apps/web/.env.example
index 4bb64c8..c9dca8f 100644
--- a/apps/web/.env.example
+++ b/apps/web/.env.example
@@ -8,6 +8,11 @@ BETTER_AUTH_SECRET=
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 
+# ─── Terminal Client ───
+# Where the billing studio lives (http://localhost:3000 for local dev,
+# https://supercode-terminal.vercel.app in production).
+NEXT_PUBLIC_TERMINAL_URL=
+
 # ─── Secrets (Infisical) ───
 INFISICAL_CLIENT_ID=
 INFISICAL_CLIENT_SECRET=
diff --git a/apps/web/app/(pages)/pricing/page.tsx b/apps/web/app/(pages)/pricing/page.tsx
index 24e43c3..b68dd3b 100644
--- a/apps/web/app/(pages)/pricing/page.tsx
+++ b/apps/web/app/(pages)/pricing/page.tsx
@@ -7,6 +7,13 @@ import Footer from "@/components/homepage/footer"
 import Link from "next/link"
 import { Check, Minus, ArrowUpRight } from "lucide-react"
 
+// Terminal client URL — where /studio lives. Override per environment.
+const TERMINAL_URL =
+  process.env.NEXT_PUBLIC_TERMINAL_URL ??
+  (process.env.NODE_ENV === "production"
+    ? "https://supercode-terminal.vercel.app"
+    : "http://localhost:3000")
+
 type Billing = "monthly" | "yearly"
 
 interface TierStats {
@@ -42,24 +49,24 @@ const TIERS: Tier[] = [
       monthly: "$1",
       yearly: "$1",
     },
-    period: "/year",
+    period: "/month",
     badge: "Free for existing users",
     badgeClass: "text-emerald-400",
     description:
-      "Open models, core features, standard limits. Just $1/year — fully refundable.",
+      "Open models, 10K requests, 16K context. $1/month for new users — fully refundable.",
     cta: "Get Started",
     href: "/download",
     popular: false,
     stats: {
-      requests: "~15K requests/month",
-      contextWindow: "32K",
+      requests: "~10K requests/month",
+      contextWindow: "16K",
       tokens: "Standard tokens",
       models: "Open models only",
     },
     features: [
       { label: "Open models only", included: true },
-      { label: "32K context window", included: true },
-      { label: "~15K requests/month", included: true },
+      { label: "16K context window", included: true },
+      { label: "~10K requests/month", included: true },
       { label: "Standard token limits", included: true },
       { label: "Standard rate limits", included: true },
       { label: "Limited usage analytics", included: true },
@@ -72,8 +79,8 @@ const TIERS: Tier[] = [
   {
     name: "Pro",
     price: {
-      monthly: { indian: "$9", international: "$12" },
-      yearly: { indian: "$100", international: "$140" },
+      monthly: { indian: "₹649", international: "$12" },
+      yearly: { indian: "₹8,300", international: "$140" },
     },
     period: "/month",
     badge: "Most popular",
@@ -81,7 +88,7 @@ const TIERS: Tier[] = [
     description:
       "Premium models, expanded context, cross-session memory, and Merge.dev Agent Handler.",
     cta: "Subscribe",
-    href: "#",
+    href: "https://test.checkout.dodopayments.com/buy/pdt_0Nk0vS5WMtkT7u2T7P70e?quantity=1",
     popular: true,
     stats: {
       requests: "~25K requests/month",
@@ -114,7 +121,7 @@ const TIERS: Tier[] = [
     description:
       "Maximum context, unlimited requests, premium models, and the highest availability.",
     cta: "Subscribe",
-    href: "#",
+    href: "https://test.checkout.dodopayments.com/buy/pdt_0NkRmfmsthQToUr41UAnd?quantity=1",
     popular: false,
     stats: {
       requests: "~110K requests/month",
@@ -151,11 +158,11 @@ const ENTERPRISE_FEATURES = [
 const FAQ = [
   {
     q: "What does the Spark $1 deposit cover?",
-    a: "Spark is $1/year for all new users — fully refundable. It is free for existing users. You can request a refund at any time.",
+    a: "Spark is $1/month for new users — fully refundable. It is free for existing (grandfathered) users with 10K requests, 16K context, and $5 monthly credits. Upgrade to Spark Premium ($1/month) for 15K requests, 32K context, and $10 credits.",
   },
   {
     q: "How does regional pricing work for Pro?",
-    a: "We offer location-based pricing for the Pro plan. Indian users pay $9/month (or $100/year). International users pay $12/month (or $140/year). All other plans are priced uniformly worldwide.",
+    a: "We offer location-based pricing for the Pro plan. Indian users pay ₹749/month (or ₹8,300/year) via UPI. International users pay $12/month (or $140/year) via card. All other plans are priced uniformly worldwide.",
   },
   {
     q: "Can I upgrade or downgrade at any time?",
@@ -187,10 +194,14 @@ function MinusIcon() {
   return <Minus className="w-3.5 h-3.5 text-muted-foreground/30 shrink-0 mt-0.5" />
 }
 
-function formatPrice(price: TierPrice, billing: Billing): string {
+function formatPrice(
+  price: TierPrice,
+  billing: Billing,
+  region: "in" | "int" = "in",
+): string {
   const p = billing === "monthly" ? price.monthly : price.yearly
   if (typeof p === "string") return p
-  return p.indian
+  return region === "in" ? p.indian : p.international
 }
 
 function formatPeriod(billing: Billing): string {
@@ -210,7 +221,7 @@ const COMPARE_ROWS: {
   {
     section: "Usage",
     label: "Monthly credits included",
-    values: ["$10", "$30", "$150"],
+    values: ["$5", "$30", "$150"],
   },
   {
     label: "DeepSeek V4 Pro effective usage\nPermanent deal — credits go up to 4× further",
@@ -226,7 +237,7 @@ const COMPARE_ROWS: {
   },
   {
     label: "Typical request volume\nApprox, depends on chosen models",
-    values: ["~15K", "~25K", "~110K"],
+    values: ["~10K", "~25K", "~110K"],
   },
   { label: "Roll-over unused credits", values: ["—", "✓", "✓"] },
   {
@@ -253,7 +264,7 @@ const COMPARE_ROWS: {
   },
   {
     label: "Context window per request",
-    values: ["32K tokens", "128K tokens", "1M tokens"],
+    values: ["16K tokens", "128K tokens", "1M tokens"],
   },
   {
     label: "Concurrent requests",
@@ -298,14 +309,21 @@ function PricingCard({
   tier,
   index,
   billing,
+  region,
+  onRegionChange,
 }: {
   tier: Tier
   index: number
   billing: Billing
+  region: "in" | "int"
+  onRegionChange: (region: "in" | "int") => void
 }) {
-  const effectiveBilling = tier.name === "Spark" ? "yearly" : billing
+  const effectiveBilling = tier.name === "Spark" ? "monthly" : billing
   const regional = isRegional(tier.price, effectiveBilling)
 
+  // All tier CTAs route to the terminal billing studio
+  const finalHref = `${TERMINAL_URL}/studio`
+
   return (
     <motion.div
       initial={{ opacity: 0, translateY: 12 }}
@@ -336,7 +354,7 @@ function PricingCard({
 
       <div className="mb-1 mt-1">
         <span className="text-3xl md:text-4xl font-semibold text-foreground tracking-tight">
-          {formatPrice(tier.price, effectiveBilling)}
+          {formatPrice(tier.price, effectiveBilling, region)}
         </span>
         <span className="text-sm text-muted-foreground font-mono">
           {formatPeriod(effectiveBilling)}
@@ -346,7 +364,8 @@ function PricingCard({
             <span className="text-foreground/70">
               {formatPrice(
                 tier.price,
-                effectiveBilling === "monthly" ? ("monthly" as Billing) : ("yearly" as Billing)
+                effectiveBilling === "monthly" ? ("monthly" as Billing) : ("yearly" as Billing),
+                region,
               )}
             </span>
             {" IN · "}
@@ -360,6 +379,25 @@ function PricingCard({
         )}
       </div>
 
+      {/* Region toggle (Pro only) */}
+      {tier.name === "Pro" && (
+        <div className="flex items-center gap-1 p-1 rounded-lg bg-white/[0.03] border border-white/5 mb-2 w-fit">
+          {(["in", "int"] as const).map((r) => (
+            <button
+              key={r}
+              onClick={() => onRegionChange(r)}
+              className={`px-2.5 py-1 rounded-md text-[11px] font-mono transition-all duration-200 ${
+                region === r
+                  ? "bg-amber-500 text-black"
+                  : "text-muted-foreground hover:text-foreground"
+              }`}
+            >
+              {r === "in" ? "IN 🇮🇳" : "INT 🌍"}
+            </button>
+          ))}
+        </div>
+      )}
+
       <h3 className="text-[15px] font-semibold text-foreground font-mono mt-5 mb-2">
         {tier.name}
       </h3>
@@ -376,7 +414,18 @@ function PricingCard({
       </div>
 
       <Link
-        href={tier.href}
+        href={finalHref}
+        target={finalHref.startsWith("http") ? "_blank" : undefined}
+        rel={finalHref.startsWith("http") ? "noopener noreferrer" : undefined}
+        onClick={(e) => {
+          // If this tier routes to the terminal /studio, keep it in the
+          // same tab — /studio handles the auth check and bounces to the
+          // terminal sign-in flow (root) when unauthenticated.
+          if (finalHref.startsWith(`${TERMINAL_URL}/`)) {
+            e.preventDefault()
+            window.location.href = finalHref
+          }
+        }}
         className={`inline-flex items-center justify-center gap-2 px-5 py-2.5 rounded-lg text-[13px] font-medium font-mono transition-all duration-200 active:scale-[0.97] mb-6 ${
           tier.popular
             ? "bg-amber-500 text-black hover:bg-amber-400"
@@ -506,6 +555,7 @@ function ComparisonTable() {
 
 export default function PricingPage() {
   const [billing, setBilling] = useState<Billing>("monthly")
+  const [region, setRegion] = useState<"in" | "int">("in")
   const [expandedFaq, setExpandedFaq] = useState<number | null>(null)
 
   return (
@@ -576,7 +626,14 @@ export default function PricingPage() {
       <section className="pb-20 md:pb-28 px-6">
         <div className="max-w-[1100px] mx-auto grid grid-cols-1 md:grid-cols-3 gap-5 md:gap-6">
           {TIERS.map((tier, i) => (
-            <PricingCard key={tier.name} tier={tier} index={i} billing={billing} />
+            <PricingCard
+              key={tier.name}
+              tier={tier}
+              index={i}
+              billing={billing}
+              region={region}
+              onRegionChange={setRegion}
+            />
           ))}
         </div>
       </section>
diff --git a/apps/web/package.json b/apps/web/package.json
index c4588d5..6e8800a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -14,7 +14,6 @@
   "dependencies": {
     "@ai-sdk/anthropic": "^0.0.56",
     "@ai-sdk/google": "^2.0.0",
-    "@dodopayments/nextjs": "^0.3.6",
     "@hookform/resolvers": "^5.2.2",
     "@prisma/adapter-pg": "^7.8.0",
     "@prisma/client": "^7.8.0",
@@ -58,7 +57,6 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
-    "dodopayments": "^2.42.2",
     "dot": "^1.1.3",
     "embla-carousel-react": "^8.6.0",
     "env": "^0.0.2",
diff --git a/bun.lock b/bun.lock
index 9055bed..fc830dd 100644
--- a/bun.lock
+++ b/bun.lock
@@ -108,7 +108,7 @@
     },
     "apps/supercode-cli/server": {
       "name": "supercode-cli",
-      "version": "0.1.91",
+      "version": "0.1.92",
       "bin": {
         "supercode": "dist/main.js",
       },
@@ -117,6 +117,7 @@
         "@ai-sdk/mcp": "^2.0.10",
         "@ai-sdk/openai-compatible": "^2.0.48",
         "@composio/core": "^0.13.1",
+        "@dodopayments/nextjs": "^0.3.7",
         "@modelcontextprotocol/sdk": "^1.9.0",
         "@prisma/adapter-pg": "^7.8.0",
         "@prisma/client": "^7.8.0",
@@ -129,6 +130,7 @@
         "chalk": "^5.6.2",
         "commander": "^15.0.0",
         "cors": "^2.8.5",
+        "dodopayments": "^2.43.0",
         "eve": "^0.22.5",
         "express": "^5.1.0",
         "marked": "^18.0.4",
@@ -216,7 +218,6 @@
       "dependencies": {
         "@ai-sdk/anthropic": "^0.0.56",
         "@ai-sdk/google": "^2.0.0",
-        "@dodopayments/nextjs": "^0.3.6",
         "@hookform/resolvers": "^5.2.2",
         "@prisma/adapter-pg": "^7.8.0",
         "@prisma/client": "^7.8.0",
@@ -260,7 +261,6 @@
         "clsx": "^2.1.1",
         "cmdk": "^1.1.1",
         "date-fns": "^4.1.0",
-        "dodopayments": "^2.42.2",
         "dot": "^1.1.3",
         "embla-carousel-react": "^8.6.0",
         "env": "^0.0.2",
@@ -605,9 +605,9 @@
 
     "@date-fns/tz": ["@date-fns/tz@1.4.1", "", {}, "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA=="],
 
-    "@dodopayments/core": ["@dodopayments/core@0.3.12", "", { "dependencies": { "dodopayments": "^2.31.2", "standardwebhooks": "^1.0.0" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-cahX0AmZI9QN6PhXDE24vUa/UBD4qU21iCgyJRC0L7jxX3dQNMwQSfP2ow9xovnrBQxrsebnwwlDoKi5wl20dA=="],
+    "@dodopayments/core": ["@dodopayments/core@0.3.13", "", { "dependencies": { "dodopayments": "^2.42.2", "standardwebhooks": "^1.0.0" }, "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-s7c3V5p0P31GCmmC1zyE/N7KK2FNB/PZdD/D6ZnMM8glGM3bdzZGFXjFzchMvwRyefeUz+FBRKSw9tbc/tXhVg=="],
 
-    "@dodopayments/nextjs": ["@dodopayments/nextjs@0.3.6", "", { "dependencies": { "@dodopayments/core": "^0.3.10" }, "peerDependencies": { "next": "^14.0.0 || ^15.0.0 || ^16.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-y+lLkeVLwSvxNW0RRorJMVxOZbzrJ4FAdTEHPVwnKISNjCPja3R9ZyGHJGzcjwd8LfTon6Ml/Ge3tcMVxXKvug=="],
+    "@dodopayments/nextjs": ["@dodopayments/nextjs@0.3.7", "", { "dependencies": { "@dodopayments/core": "^0.3.13" }, "peerDependencies": { "next": "^14.0.0 || ^15.0.0 || ^16.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-X3BDTeJh0/Oo8GbVg12OPNcKaVkclIpyjqO0pDzadCbC/7Isy/1Ytem03uv8ntqiQyg0hjycDQZXQ2H1H77svw=="],
 
     "@dotenvx/dotenvx": ["@dotenvx/dotenvx@1.70.0", "", { "dependencies": { "commander": "^11.1.0", "dotenv": "^17.2.1", "eciesjs": "^0.4.10", "enquirer": "^2.4.1", "execa": "^5.1.1", "fdir": "^6.2.0", "ignore": "^5.3.0", "object-treeify": "1.1.33", "picomatch": "^4.0.4", "which": "^4.0.0", "yocto-spinner": "^1.1.0" }, "bin": { "dotenvx": "src/cli/dotenvx.js" } }, "sha512-vC/rom87ym8HEyVdzZZS6/PYGg1Z5fmozUZ8l6cw1sYAxdL1lEyvE/JbK8cMFQoq3GsR/P1PiQRY+VXMtDN9bw=="],
 
@@ -2279,7 +2279,7 @@
 
     "doctrine": ["doctrine@2.1.0", "", { "dependencies": { "esutils": "^2.0.2" } }, "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="],
 
-    "dodopayments": ["dodopayments@2.42.2", "", { "dependencies": { "standardwebhooks": "^1.0.0" }, "bin": { "dodopayments": "bin/cli" } }, "sha512-XBF8zrnfkjAhX7OyrR3KauK6bH+oW3yZ+uqy6RBWI5XdZvrEtASabvvfHrBX3UGR3Bbxl3t1rkpcao+riKSOuw=="],
+    "dodopayments": ["dodopayments@2.43.0", "", { "dependencies": { "standardwebhooks": "^1.0.0" }, "bin": { "dodopayments": "bin/cli" } }, "sha512-svlPEf2H6Zp4SFKsW+ylL3ssBsupG67O6nEW77Md0XUIr1A21wmnyw0PlUjolUCMPNXMuYnsqpVatgyuZytYiA=="],
 
     "dom-helpers": ["dom-helpers@5.2.1", "", { "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" } }, "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA=="],