Fix trigger plan resolution by querying users table instead of org subscription status

The org subscriptionStatus can diverge from users.plan (e.g. canceled-but-in-period,
trialing, or manually upgraded users). Replace resolveUserPlan with
resolveOrganizationPlan which checks if any org member has plan "pro", matching the
same source of truth used by manual execution.

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

Author: bchapuis

apps/api/src/db/queries.ts

@@ -2156,19 +2156,22 @@ 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: {
-  subscriptionStatus: string | null;
-  currentPeriodEnd: Date | null;
-}): string {
-  const hasProAccess =
-    billingInfo.subscriptionStatus === "active" ||
-    (billingInfo.subscriptionStatus === "canceled" &&
-      billingInfo.currentPeriodEnd !== null &&
-      billingInfo.currentPeriodEnd > new Date());
-  return hasProAccess ? "pro" : "trial";
+ * Resolve user plan for an organization by checking its members.
+ * Used by automated triggers where no specific user context is available.
+ * Returns "pro" if any member has a pro plan, "trial" otherwise.
+ */
+export async function resolveOrganizationPlan(
+  db: ReturnType<typeof createDatabase>,
+  organizationId: string
+): Promise<string> {
+  const [user] = await db
+    .select({ plan: users.plan })
+    .from(users)
+    .where(
+      and(eq(users.organizationId, organizationId), eq(users.plan, Plan.PRO))
+    )
+    .limit(1);
+  return user?.plan ?? Plan.TRIAL;
 }
 
 /**

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: await resolveOrganizationPlan(db, organizationId),
     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: await resolveOrganizationPlan(db, workflowInfo.organizationId),
       workflow: {
         id: workflowInfo.id,
         name: workflowData.name,

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: await resolveOrganizationPlan(db, organizationId),
     workflow: {
       id: workflow.id,
       name: workflow.name,

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

@@ -8,7 +8,7 @@ import {
   getTelegramBot,
   getTelegramSecretTokenByBot,
   getTelegramTriggersByBot,
-  resolveUserPlan,
+  resolveOrganizationPlan,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -216,7 +216,7 @@ async function executeWorkflow(
     userId: "telegram_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: resolveUserPlan(billingInfo),
+    userPlan: await resolveOrganizationPlan(db, organizationId),
     workflow: {
       id: workflow.id,
       name: workflow.name,

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

@@ -8,7 +8,7 @@ import {
   getWhatsAppAccount,
   getWhatsAppTriggersByAccount,
   getWhatsAppVerifyTokenByAccount,
-  resolveUserPlan,
+  resolveOrganizationPlan,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -322,7 +322,7 @@ async function executeWorkflow(
     userId: "whatsapp_trigger",
     organizationId,
     computeCredits: billingInfo.computeCredits,
-    userPlan: resolveUserPlan(billingInfo),
+    userPlan: await resolveOrganizationPlan(db, organizationId),
     workflow: {
       id: workflow.id,
       name: workflow.name,

apps/api/src/scheduled.ts

@@ -5,7 +5,7 @@ import {
   createDatabase,
   getActiveScheduledTriggers,
   getOrganizationBillingInfo,
-  resolveUserPlan,
+  resolveOrganizationPlan,
 } from "./db";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -74,7 +74,7 @@ export async function handleScheduledEvent(
         userId: "scheduled_trigger",
         organizationId: workflow.organizationId,
         computeCredits: billingInfo.computeCredits,
-        userPlan: resolveUserPlan(billingInfo),
+        userPlan: await resolveOrganizationPlan(db, workflow.organizationId),
         workflow: {
           id: workflow.id,
           name: workflow.name,