Merge pull request #1004 from trycompai/main

[comp] Production Deploy

Author: claudfuen

apps/app/package.json

@@ -27,18 +27,22 @@
     "@prisma/instrumentation": "6.6.0",
     "@react-email/components": "^0.0.41",
     "@react-email/render": "^1.1.2",
+    "@react-three/drei": "^10.3.0",
+    "@react-three/fiber": "^9.1.2",
+    "@react-three/postprocessing": "^3.0.4",
     "@tanstack/react-query": "^5.74.4",
     "@tanstack/react-table": "^8.21.3",
     "@trigger.dev/react-hooks": "3.3.17",
     "@trigger.dev/sdk": "3.3.17",
+    "@types/three": "^0.177.0",
     "@uploadthing/react": "^7.3.0",
     "@upstash/ratelimit": "^2.0.5",
     "@vercel/sdk": "^1.7.1",
     "ai": "^4.3.16",
     "axios": "^1.9.0",
     "better-auth": "^1.2.8",
     "d3": "^7.9.0",
-    "framer-motion": "^12.9.2",
+    "framer-motion": "^12.18.1",
     "geist": "^1.3.1",
     "motion": "^12.9.2",
     "next": "15.4.0-canary.85",
@@ -62,6 +66,7 @@
     "resend": "^4.4.1",
     "sonner": "^1.7.1",
     "stripe": "^18.1.0",
+    "three": "^0.177.0",
     "ts-pattern": "^5.7.0",
     "use-debounce": "^10.0.4",
     "use-long-press": "^3.3.0",

apps/app/src/actions/organization/choose-self-serve.ts

@@ -0,0 +1,46 @@
+'use server';
+
+import { authWithOrgAccessClient } from '@/actions/safe-action';
+import { db } from '@comp/db';
+import { revalidatePath } from 'next/cache';
+import { headers } from 'next/headers';
+import { z } from 'zod';
+
+const chooseSelfServeSchema = z.object({
+  organizationId: z.string(),
+});
+
+export const chooseSelfServeAction = authWithOrgAccessClient
+  .inputSchema(chooseSelfServeSchema)
+  .metadata({
+    name: 'choose-self-serve',
+    track: {
+      event: 'choose-self-serve',
+      description: 'User chose the self-serve (free) plan',
+      channel: 'server',
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { organizationId } = parsedInput;
+    const { member } = ctx;
+
+    // Update the organization to mark that they chose self-serve
+    await db.organization.update({
+      where: {
+        id: organizationId,
+      },
+      data: {
+        subscriptionType: 'SELF_SERVE',
+      },
+    });
+
+    // Revalidate the path
+    const headersList = await headers();
+    let path = headersList.get('x-pathname') || headersList.get('referer') || '';
+    path = path.replace(/\/[a-z]{2}\//, '/');
+    revalidatePath(path);
+
+    return {
+      success: true,
+    };
+  });

apps/app/src/actions/stripe/fetch-price-details.ts

@@ -0,0 +1,101 @@
+'use server';
+
+import { stripe } from '@/actions/organization/lib/stripe';
+import { env } from '@/env.mjs';
+import { client } from '@comp/kv';
+import Stripe from 'stripe';
+
+type PriceDetails = {
+  id: string;
+  unitAmount: number | null;
+  currency: string;
+  interval: Stripe.Price.Recurring.Interval | null;
+  productName: string | null;
+};
+
+export type CachedPrices = {
+  monthlyPrice: PriceDetails | null;
+  yearlyPrice: PriceDetails | null;
+  fetchedAt: number;
+};
+
+const CACHE_DURATION = 30 * 60; // 30 minutes in seconds
+
+export async function fetchStripePriceDetails(): Promise<CachedPrices> {
+  // Fetch from Stripe
+  const monthlyPriceId = env.NEXT_PUBLIC_STRIPE_SUBSCRIPTION_MANAGED_MONTHLY_PRICE_ID;
+  const yearlyPriceId = env.NEXT_PUBLIC_STRIPE_SUBSCRIPTION_MANAGED_YEARLY_PRICE_ID;
+
+  // Create a unique cache key that includes the price IDs
+  const cacheKey = `stripe:managed-prices:${monthlyPriceId || 'none'}:${yearlyPriceId || 'none'}`;
+
+  try {
+    // Check cache first
+    const cached = await client.get<CachedPrices>(cacheKey);
+    if (cached && cached.fetchedAt && Date.now() - cached.fetchedAt < CACHE_DURATION * 1000) {
+      return cached;
+    }
+  } catch (error) {
+    console.error('[STRIPE] Error reading from cache:', error);
+  }
+
+  let monthlyPrice: PriceDetails | null = null;
+  let yearlyPrice: PriceDetails | null = null;
+
+  try {
+    // Fetch monthly price if ID exists
+    if (monthlyPriceId) {
+      const price = await stripe.prices.retrieve(monthlyPriceId, {
+        expand: ['product'],
+      });
+
+      monthlyPrice = {
+        id: price.id,
+        unitAmount: price.unit_amount,
+        currency: price.currency,
+        interval: price.recurring?.interval ?? null,
+        productName:
+          price.product && typeof price.product === 'object' && !price.product.deleted
+            ? price.product.name
+            : null,
+      };
+    }
+
+    // Fetch yearly price if ID exists
+    if (yearlyPriceId) {
+      const price = await stripe.prices.retrieve(yearlyPriceId, {
+        expand: ['product'],
+      });
+
+      yearlyPrice = {
+        id: price.id,
+        unitAmount: price.unit_amount,
+        currency: price.currency,
+        interval: price.recurring?.interval ?? null,
+        productName:
+          price.product && typeof price.product === 'object' && !price.product.deleted
+            ? price.product.name
+            : null,
+      };
+    }
+  } catch (error) {
+    console.error('[STRIPE] Error fetching prices:', error);
+  }
+
+  const priceData: CachedPrices = {
+    monthlyPrice,
+    yearlyPrice,
+    fetchedAt: Date.now(),
+  };
+
+  // Cache the results
+  try {
+    await client.set(cacheKey, priceData, {
+      ex: CACHE_DURATION,
+    });
+  } catch (error) {
+    console.error('[STRIPE] Error caching price data:', error);
+  }
+
+  return priceData;
+}

apps/app/src/app/(app)/[orgId]/components/OnboardingTracker.tsx

@@ -41,7 +41,12 @@ export const OnboardingTracker = ({
 }) => {
   const [currentMessageIndex, setCurrentMessageIndex] = useState(0);
   const triggerJobId = onboarding.triggerJobId;
-  const { run, error } = useRealtimeRun(triggerJobId ?? undefined, {
+
+  if (!triggerJobId || !publicAccessToken) {
+    return <div className="text-muted-foreground text-sm">Unable to load onboarding tracker.</div>;
+  }
+
+  const { run, error } = useRealtimeRun(triggerJobId, {
     accessToken: publicAccessToken,
   });
 

apps/app/src/app/(app)/[orgId]/layout.tsx

@@ -1,8 +1,10 @@
+import { getSubscriptionData } from '@/app/api/stripe/getSubscriptionData';
 import { AnimatedLayout } from '@/components/animated-layout';
 import { Header } from '@/components/header';
 import { AssistantSheet } from '@/components/sheets/assistant-sheet';
 import { Sidebar } from '@/components/sidebar';
 import { SidebarProvider } from '@/context/sidebar-context';
+import { SubscriptionProvider } from '@/context/subscription-context';
 import { auth } from '@/utils/auth';
 import { db } from '@comp/db';
 import dynamic from 'next/dynamic';
@@ -60,6 +62,18 @@ export default async function Layout({
     return redirect('/auth/unauthorized');
   }
 
+  // Fetch subscription data for the organization
+  const subscriptionData = await getSubscriptionData(requestedOrgId);
+
+  // Log subscription status for monitoring
+  if (subscriptionData.status === 'none') {
+    console.log(`[SUBSCRIPTION] No subscription for org ${requestedOrgId}`);
+  } else if (subscriptionData.status === 'self-serve') {
+    console.log(`[SUBSCRIPTION] Org ${requestedOrgId} is on self-serve (free) plan`);
+  } else {
+    console.log(`[SUBSCRIPTION] Org ${requestedOrgId} status: ${subscriptionData.status}`);
+  }
+
   const onboarding = await db.onboarding.findFirst({
     where: {
       organizationId: requestedOrgId,
@@ -83,7 +97,7 @@ export default async function Layout({
           className="textured-background mx-auto px-4 py-4"
           style={{ minHeight: `calc(100vh - ${pixelsOffset}px)` }}
         >
-          {children}
+          <SubscriptionProvider subscription={subscriptionData}>{children}</SubscriptionProvider>
         </div>
         <AssistantSheet />
       </AnimatedLayout>

apps/app/src/app/(app)/[orgId]/settings/billing/cancel-subscription-dialog.tsx

@@ -0,0 +1,74 @@
+'use client';
+
+import { Button } from '@comp/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@comp/ui/dialog';
+import { Loader2 } from 'lucide-react';
+
+interface CancelSubscriptionDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onConfirm: () => void;
+  isLoading?: boolean;
+  currentPeriodEnd?: number;
+}
+
+export function CancelSubscriptionDialog({
+  open,
+  onOpenChange,
+  onConfirm,
+  isLoading = false,
+  currentPeriodEnd,
+}: CancelSubscriptionDialogProps) {
+  const formattedDate = currentPeriodEnd
+    ? new Date(currentPeriodEnd * 1000).toLocaleDateString('en-US', {
+        year: 'numeric',
+        month: 'long',
+        day: 'numeric',
+      })
+    : null;
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Cancel Subscription</DialogTitle>
+          <DialogDescription className="space-y-3 pt-3">
+            <p>Are you sure you want to cancel your subscription?</p>
+            {formattedDate && (
+              <p className="text-sm">
+                Your subscription will remain active until{' '}
+                <span className="font-medium">{formattedDate}</span>. You can resume your
+                subscription at any time before this date.
+              </p>
+            )}
+            <p className="text-sm text-muted-foreground">
+              You'll lose access to all premium features after your current billing period ends.
+            </p>
+          </DialogDescription>
+        </DialogHeader>
+        <DialogFooter className="gap-2">
+          <Button variant="ghost" onClick={() => onOpenChange(false)} disabled={isLoading}>
+            Keep Subscription
+          </Button>
+          <Button
+            variant="destructive"
+            onClick={() => {
+              onConfirm();
+            }}
+            disabled={isLoading}
+          >
+            {isLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+            Cancel Subscription
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}

apps/app/src/app/(app)/[orgId]/settings/billing/loading.tsx

@@ -0,0 +1,3 @@
+import Loader from '@/components/ui/loader';
+
+export default Loader;