fix(webapp): activate managed-cloud orgs via select-plan, not at creation

New managed-cloud orgs were created already activated, so they skipped the
select-plan flow that provisions their billing entitlement — leaving the
free-tier usage cap unenforced. Create managed-cloud orgs deactivated so
they're routed through select-plan, which activates them once a plan is
selected. Self-hosters have no billing gate and remain active immediately.

Rename the Organization.v3Enabled Prisma field to isActivated (mapped to the
existing v3Enabled column, so the database and billing service are unchanged)
to better reflect what the flag now gates.

Author: matt-aitken

.server-changes/fix-managed-cloud-org-activation.md

@@ -0,0 +1,6 @@
+---
+area: webapp
+type: fix
+---
+
+New managed-cloud orgs were created already activated, so they skipped the select-plan flow that provisions their billing entitlement — leaving the free-tier usage cap unenforced. Managed-cloud orgs are now created deactivated and routed through select-plan, which activates them once a plan is selected. Self-hosters have no billing gate and remain active immediately.

apps/webapp/app/models/admin.server.ts

@@ -131,7 +131,7 @@ export async function adminGetOrganizations(userId: string, { page, search }: Se
       slug: true,
       title: true,
       v2Enabled: true,
-      v3Enabled: true,
+      isActivated: true,
       deletedAt: true,
       members: {
         select: {

apps/webapp/app/models/organization.server.ts

@@ -86,7 +86,7 @@ export async function createOrganization(
     );
   }
 
-  const _features = featuresForUrl(new URL(env.APP_ORIGIN));
+  const features = featuresForUrl(new URL(env.APP_ORIGIN));
 
   const organization = await prisma.organization.create({
     data: {
@@ -102,7 +102,10 @@ export async function createOrganization(
           role: "ADMIN",
         },
       },
-      v3Enabled: true,
+      // Managed-cloud orgs start deactivated so they're routed through
+      // select-plan, which provisions their billing entitlement and activates
+      // them. Self-hosters have no billing gate, so they're active immediately.
+      isActivated: !features.isManagedCloud,
     },
     include: {
       members: true,

apps/webapp/app/models/project.server.ts

@@ -32,7 +32,7 @@ export async function createProject(
     select: {
       id: true,
       slug: true,
-      v3Enabled: true,
+      isActivated: true,
       maximumConcurrencyLimit: true,
       maximumProjectCount: true,
     },
@@ -49,7 +49,7 @@ export async function createProject(
   }
 
   if (version === "v3") {
-    if (!organization.v3Enabled) {
+    if (!organization.isActivated) {
       throw new Error(`Organization can't create v3 projects.`);
     }
   }

apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx

@@ -118,7 +118,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     select: {
       id: true,
       title: true,
-      v3Enabled: true,
+      isActivated: true,
       v2Enabled: true,
       hasRequestedV3: true,
       _count: {
@@ -138,7 +138,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   }
 
   const { isManagedCloud } = featuresForRequest(request);
-  if (isManagedCloud && !organization.v3Enabled) {
+  if (isManagedCloud && !organization.isActivated) {
     return redirect(selectPlanPath({ slug: organizationSlug }));
   }
 
@@ -151,7 +151,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
       title: organization.title,
       slug: organizationSlug,
       projectsCount: organization._count.projects,
-      v3Enabled: organization.v3Enabled,
+      isActivated: organization.isActivated,
       v2Enabled: organization.v2Enabled,
       hasRequestedV3: organization.hasRequestedV3,
     },
@@ -324,7 +324,7 @@ export default function Page() {
   const { organization, message } = useTypedLoaderData<typeof loader>();
   const lastSubmission = useActionData();
 
-  const canCreateV3Projects = organization.v3Enabled;
+  const canCreateV3Projects = organization.isActivated;
 
   const [form, { projectName, projectVersion }] = useForm({
     id: "create-project",

apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx

@@ -43,7 +43,7 @@ export const loader = dashboardLoader(
       throw new Response(null, { status: 404, statusText: "Organization not found" });
     }
 
-    if (organization.v3Enabled) {
+    if (organization.isActivated) {
       return redirect(organizationPath({ slug: organizationSlug }));
     }
 

apps/webapp/test/helpers/seedTestEnvironment.ts

@@ -16,7 +16,7 @@ export async function seedTestEnvironment(prisma: PrismaClient) {
     data: {
       title: `e2e-test-org-${suffix}`,
       slug: `e2e-org-${suffix}`,
-      v3Enabled: true,
+      isActivated: true,
     },
   });
 

apps/webapp/test/helpers/seedTestUserProject.ts

@@ -35,7 +35,7 @@ export async function seedTestUserProject(
     data: {
       title: `e2e-pat-org-${suffix}`,
       slug: `e2e-pat-org-${suffix}`,
-      v3Enabled: true,
+      isActivated: true,
       members: { create: { userId: user.id, role: "ADMIN" } },
     },
   });

internal-packages/database/prisma/schema.prisma

@@ -212,7 +212,7 @@ model Organization {
 
   runsEnabled Boolean @default(true)
 
-  v3Enabled Boolean @default(false)
+  isActivated Boolean @default(false) @map("v3Enabled")
 
   /// @deprecated
   v2Enabled      Boolean @default(false)