Remove plan column from users and derive plan from org subscription status

Plan was stored on the users table but the actual source of truth was always
the organization's Stripe subscription status. This removes the redundant
column and derives plan via resolveOrganizationPlan() everywhere. Also fixes
endpoint-execute.ts which had plan hardcoded to "pro" and eliminates duplicate
plan resolution logic in the billing route.

To manually grant pro access without a Stripe subscription, set
subscription_status = 'active' on the organization.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: bchapuis

apps/api/src/auth.ts

@@ -459,7 +459,6 @@ auth.post("/refresh", async (c) => {
       name: result.name,
       email: result.email ?? undefined,
       avatarUrl: result.avatarUrl ?? undefined,
-      plan: result.plan,
       role: result.role,
       developerMode: result.developerMode,
       provider,
@@ -552,7 +551,6 @@ auth.get(
         name: userName,
         email: userEmail ?? undefined,
         avatarUrl,
-        plan: savedUser.plan,
         role: savedUser.role,
         developerMode: savedUser.developerMode,
         provider: "github",
@@ -631,7 +629,6 @@ auth.get(
         name: userName,
         email: userEmail,
         avatarUrl: avatarUrl ?? undefined,
-        plan: savedUser.plan,
         role: savedUser.role,
         developerMode: savedUser.developerMode,
         provider: "google",

apps/api/src/db/migrations/0048_move_plan_to_organizations.sql

@@ -0,0 +1,3 @@
+-- Remove plan from users (now derived from organization subscription info)
+DROP INDEX IF EXISTS users_plan_idx;
+ALTER TABLE users DROP COLUMN plan;

apps/api/src/db/queries.ts

@@ -48,8 +48,6 @@ import {
   OrganizationRole,
   type OrganizationRoleType,
   organizations,
-  Plan,
-  type PlanType,
   type QueueInsert,
   type QueueRow,
   type QueueTriggerInsert,
@@ -92,7 +90,6 @@ export type UserData = {
   name: string;
   email?: string;
   avatarUrl?: string;
-  plan?: string;
   role?: string;
 };
 
@@ -169,7 +166,6 @@ export async function saveUser(
     googleId: provider === "google" ? providerId : undefined,
     avatarUrl: avatarUrl,
     organizationId: organizationId,
-    plan: (userData.plan as PlanType) || Plan.TRIAL,
     role: (userData.role as UserRoleType) || UserRole.USER,
     createdAt: now,
     updatedAt: now,
@@ -2159,7 +2155,7 @@ export async function getOrganizationBillingInfo(
  * Derive user plan from organization billing info.
  * Pro if has active subscription OR canceled but still in billing period.
  */
-export function resolveUserPlan(billingInfo: {
+export function resolveOrganizationPlan(billingInfo: {
   subscriptionStatus: string | null;
   currentPeriodEnd: Date | null;
 }): string {

apps/api/src/db/schema/index.ts

@@ -12,15 +12,6 @@ import {
  * ENUMS & CONSTANTS
  */
 
-// Subscription plan types
-export const Plan = {
-  TRIAL: "trial",
-  FREE: "free",
-  PRO: "pro",
-} as const;
-
-export type PlanType = (typeof Plan)[keyof typeof Plan];
-
 // User permission roles
 export const UserRole = {
   USER: "user",
@@ -178,7 +169,6 @@ export const users = sqliteTable(
     organizationId: text("organization_id")
       .notNull()
       .references(() => organizations.id, { onDelete: "cascade" }),
-    plan: text("plan").$type<PlanType>().notNull().default(Plan.TRIAL),
     role: text("role").$type<UserRoleType>().notNull().default(UserRole.USER),
     developerMode: integer("developer_mode", { mode: "boolean" })
       .notNull()
@@ -195,7 +185,6 @@ export const users = sqliteTable(
     index("users_organization_id_idx").on(table.organizationId),
     index("users_email_idx").on(table.email),
     index("users_name_idx").on(table.name),
-    index("users_plan_idx").on(table.plan),
     index("users_role_idx").on(table.role),
     index("users_developer_mode_idx").on(table.developerMode),
     index("users_created_at_idx").on(table.createdAt),

apps/api/src/email.ts

@@ -4,7 +4,7 @@ import type { Bindings } from "./context";
 import {
   createDatabase,
   getOrganizationBillingInfo,
-  resolveUserPlan,
+  resolveOrganizationPlan,
 } from "./db";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -179,7 +179,7 @@ async function triggerWorkflowForEmail({
     userId: "email_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: resolveUserPlan(billingInfo),
+    userPlan: resolveOrganizationPlan(billingInfo),
     workflow: {
       id: workflow.id,
       name: workflow.name,

apps/api/src/queue.ts

@@ -4,7 +4,7 @@ import { createDatabase } from "./db";
 import {
   getOrganizationBillingInfo,
   getQueueTriggersByQueue,
-  resolveUserPlan,
+  resolveOrganizationPlan,
 } from "./db/queries";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -42,7 +42,7 @@ async function executeWorkflow(
       userId: "queue_trigger",
       organizationId: workflowInfo.organizationId,
       computeCredits: billingInfo.computeCredits,
-      userPlan: resolveUserPlan(billingInfo),
+      userPlan: resolveOrganizationPlan(billingInfo),
       workflow: {
         id: workflowInfo.id,
         name: workflowData.name,

apps/api/src/routes/admin/users.ts

@@ -4,7 +4,13 @@ import { Hono } from "hono";
 import { z } from "zod";
 
 import { ApiContext } from "../../context";
-import { createDatabase, memberships, organizations, users } from "../../db";
+import {
+  createDatabase,
+  memberships,
+  organizations,
+  resolveOrganizationPlan,
+  users,
+} from "../../db";
 
 const adminUsersRoutes = new Hono<ApiContext>();
 
@@ -40,25 +46,37 @@ adminUsersRoutes.get(
         .from(users)
         .where(whereClause);
 
-      // Get paginated users
-      const usersList = await db
+      // Get paginated users with org billing info to derive plan
+      const rows = await db
         .select({
           id: users.id,
           name: users.name,
           email: users.email,
           avatarUrl: users.avatarUrl,
-          plan: users.plan,
+          subscriptionStatus: organizations.subscriptionStatus,
+          currentPeriodEnd: organizations.currentPeriodEnd,
           role: users.role,
           developerMode: users.developerMode,
           createdAt: users.createdAt,
           updatedAt: users.updatedAt,
         })
         .from(users)
+        .innerJoin(organizations, eq(users.organizationId, organizations.id))
         .where(whereClause)
         .orderBy(desc(users.createdAt))
         .limit(limit)
         .offset(offset);
 
+      const usersList = rows.map(
+        ({ subscriptionStatus, currentPeriodEnd, ...user }) => ({
+          ...user,
+          plan: resolveOrganizationPlan({
+            subscriptionStatus,
+            currentPeriodEnd,
+          }),
+        })
+      );
+
       return c.json({
         users: usersList,
         pagination: {
@@ -85,13 +103,37 @@ adminUsersRoutes.get("/:id", async (c) => {
   const userId = c.req.param("id");
 
   try {
-    // Get user details
-    const [user] = await db.select().from(users).where(eq(users.id, userId));
+    // Get user details with org billing info to derive plan
+    const [row] = await db
+      .select({
+        id: users.id,
+        name: users.name,
+        email: users.email,
+        avatarUrl: users.avatarUrl,
+        githubId: users.githubId,
+        googleId: users.googleId,
+        subscriptionStatus: organizations.subscriptionStatus,
+        currentPeriodEnd: organizations.currentPeriodEnd,
+        role: users.role,
+        developerMode: users.developerMode,
+        tourCompleted: users.tourCompleted,
+        createdAt: users.createdAt,
+        updatedAt: users.updatedAt,
+      })
+      .from(users)
+      .innerJoin(organizations, eq(users.organizationId, organizations.id))
+      .where(eq(users.id, userId));
 
-    if (!user) {
+    if (!row) {
       return c.json({ error: "User not found" }, 404);
     }
 
+    const { subscriptionStatus, currentPeriodEnd, ...userFields } = row;
+    const user = {
+      ...userFields,
+      plan: resolveOrganizationPlan({ subscriptionStatus, currentPeriodEnd }),
+    };
+
     // Get user's organization memberships
     const userMemberships = await db
       .select({
@@ -108,20 +150,7 @@ adminUsersRoutes.get("/:id", async (c) => {
       .where(eq(memberships.userId, userId));
 
     return c.json({
-      user: {
-        id: user.id,
-        name: user.name,
-        email: user.email,
-        avatarUrl: user.avatarUrl,
-        githubId: user.githubId,
-        googleId: user.googleId,
-        plan: user.plan,
-        role: user.role,
-        developerMode: user.developerMode,
-        tourCompleted: user.tourCompleted,
-        createdAt: user.createdAt,
-        updatedAt: user.updatedAt,
-      },
+      user,
       memberships: userMemberships,
     });
   } catch (error) {

apps/api/src/routes/billing.ts

@@ -14,7 +14,7 @@ import { z } from "zod";
 import { jwtMiddleware } from "../auth";
 import { PRO_INCLUDED_CREDITS, TRIAL_CREDITS } from "../constants/billing";
 import type { ApiContext } from "../context";
-import { createDatabase, organizations } from "../db";
+import { createDatabase, organizations, resolveOrganizationPlan } from "../db";
 import { createStripeService } from "../services/stripe-service";
 import { getOrganizationComputeUsage } from "../utils/credits";
 
@@ -47,15 +47,10 @@ billing.get("/", async (c) => {
     organizationId
   );
 
-  // Determine plan - Pro if has active subscription OR canceled but still in period
-  const hasProAccess =
-    org.subscriptionStatus === "active" ||
-    (org.subscriptionStatus === "canceled" &&
-      org.currentPeriodEnd &&
-      new Date(org.currentPeriodEnd) > new Date());
-  const plan = hasProAccess ? "pro" : "trial";
+  // Resolve plan from organization billing info
+  const plan = resolveOrganizationPlan(org);
   // Use constants for included credits (database value may be outdated)
-  const includedCredits = hasProAccess ? PRO_INCLUDED_CREDITS : TRIAL_CREDITS;
+  const includedCredits = plan === "pro" ? PRO_INCLUDED_CREDITS : TRIAL_CREDITS;
 
   const response: GetBillingResponse = {
     billing: {

apps/api/src/routes/discord-webhook.ts

@@ -8,7 +8,7 @@ import {
   getDiscordBotById,
   getDiscordTriggersByBot,
   getOrganizationBillingInfo,
-  resolveUserPlan,
+  resolveOrganizationPlan,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -299,7 +299,7 @@ async function executeWorkflow(
     userId: "discord_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: resolveUserPlan(billingInfo),
+    userPlan: resolveOrganizationPlan(billingInfo),
     workflow: {
       id: workflow.id,
       name: workflow.name,

apps/api/src/routes/endpoint-execute.ts

@@ -7,6 +7,7 @@ import {
   getEndpointById,
   getEndpointTriggersByEndpoint,
   getOrganizationBillingInfo,
+  resolveOrganizationPlan,
   verifyApiKey,
 } from "../db";
 import { createRateLimitMiddleware } from "../middleware/rate-limit";
@@ -115,7 +116,7 @@ endpointExecuteRoutes.on(
         subscriptionStatus: subscriptionStatus ?? undefined,
         overageLimit: overageLimit ?? null,
         parameters,
-        userPlan: "pro",
+        userPlan: resolveOrganizationPlan(billingInfo),
         env: c.env,
       });