Add unlimited usage flag to bypass credit checks

bchapuis · claude · bchapuis · commit aea45d7192b8 · 2026-04-27T22:47:14.000+02:00
Introduces an `unlimited_usage` column on organizations for internal/test
accounts that should bypass all credit enforcement. Plumbs the flag from
the DB through `WorkflowExecutorOptions` and `RuntimeParams` into the
credit service, where it short-circuits `canExecute` before the KV usage
fetch. Also extracts `resolveOrganizationBillingOptions` to centralise the
billing-row -&gt; executor-options mapping shared across 11 trigger sites.

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/apps/api/src/db/migrations/0054_add_unlimited_usage.sql b/apps/api/src/db/migrations/0054_add_unlimited_usage.sql
@@ -0,0 +1,3 @@
+-- Add unlimited_usage flag for organizations exempted from credit limits
+-- (e.g., internal/test accounts without a Stripe subscription).
+ALTER TABLE `organizations` ADD COLUMN `unlimited_usage` integer DEFAULT false NOT NULL;
diff --git a/apps/api/src/db/queries.ts b/apps/api/src/db/queries.ts
@@ -1674,6 +1674,7 @@ export async function getOrganizationBillingInfo(
       subscriptionStatus: string | null;
       currentPeriodEnd: Date | null;
       overageLimit: number | null;
+      unlimitedUsage: boolean;
     }
   | undefined
 > {
@@ -1683,6 +1684,7 @@ export async function getOrganizationBillingInfo(
       subscriptionStatus: organizations.subscriptionStatus,
       currentPeriodEnd: organizations.currentPeriodEnd,
       overageLimit: organizations.overageLimit,
+      unlimitedUsage: organizations.unlimitedUsage,
     })
     .from(organizations)
     .where(eq(organizations.id, organizationId))
@@ -1713,6 +1715,26 @@ export function resolveOrganizationPlan(
   return hasProAccess ? "pro" : "trial";
 }
 
+/**
+ * Build the billing-related options consumed by WorkflowExecutor and Runtime
+ * from a raw organization billing row. Centralises null coercion and plan
+ * resolution so all execution call sites stay in sync as billing fields evolve.
+ */
+export function resolveOrganizationBillingOptions(
+  billingInfo: NonNullable<
+    Awaited<ReturnType<typeof getOrganizationBillingInfo>>
+  >,
+  cloudflareEnv?: string
+) {
+  return {
+    computeCredits: billingInfo.computeCredits,
+    subscriptionStatus: billingInfo.subscriptionStatus ?? undefined,
+    overageLimit: billingInfo.overageLimit ?? null,
+    unlimitedUsage: billingInfo.unlimitedUsage,
+    userPlan: resolveOrganizationPlan(billingInfo, cloudflareEnv),
+  };
+}
+
 /**
  * Create a new secret for an organization
  *
diff --git a/apps/api/src/db/schema/index.ts b/apps/api/src/db/schema/index.ts
@@ -154,6 +154,9 @@ export const organizations = sqliteTable(
     currentPeriodStart: integer("current_period_start", { mode: "timestamp" }),
     currentPeriodEnd: integer("current_period_end", { mode: "timestamp" }),
     overageLimit: integer("overage_limit"), // null = unlimited
+    unlimitedUsage: integer("unlimited_usage", { mode: "boolean" })
+      .notNull()
+      .default(false),
     createdAt: createCreatedAt(),
     updatedAt: createUpdatedAt(),
   },
diff --git a/apps/api/src/email.ts b/apps/api/src/email.ts
@@ -4,7 +4,7 @@ import type { Bindings } from "./context";
 import {
   createDatabase,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "./db";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -178,8 +178,7 @@ async function triggerWorkflowForEmail({
   const executionParams = {
     userId: "email_trigger",
     organizationId,
-    computeCredits: billingInfo.computeCredits,
-    userPlan: resolveOrganizationPlan(billingInfo, env.CLOUDFLARE_ENV),
+    ...resolveOrganizationBillingOptions(billingInfo, env.CLOUDFLARE_ENV),
     workflow: {
       id: workflow.id,
       name: workflow.name,
diff --git a/apps/api/src/queue.ts b/apps/api/src/queue.ts
@@ -4,7 +4,7 @@ import { createDatabase } from "./db";
 import {
   getOrganizationBillingInfo,
   getQueueTriggersByQueue,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "./db/queries";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -41,8 +41,7 @@ async function executeWorkflow(
     const executionParams = {
       userId: "queue_trigger",
       organizationId: workflowInfo.organizationId,
-      computeCredits: billingInfo.computeCredits,
-      userPlan: resolveOrganizationPlan(billingInfo, env.CLOUDFLARE_ENV),
+      ...resolveOrganizationBillingOptions(billingInfo, env.CLOUDFLARE_ENV),
       workflow: {
         id: workflowInfo.id,
         name: workflowData.name,
diff --git a/apps/api/src/routes/discord-webhook.ts b/apps/api/src/routes/discord-webhook.ts
@@ -8,7 +8,7 @@ import {
   getBotById,
   getBotTriggersByBot,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -298,8 +298,7 @@ async function executeWorkflow(
   const executionParams = {
     userId: "discord_trigger",
     organizationId,
-    computeCredits: billingInfo.computeCredits,
-    userPlan: resolveOrganizationPlan(billingInfo, env.CLOUDFLARE_ENV),
+    ...resolveOrganizationBillingOptions(billingInfo, env.CLOUDFLARE_ENV),
     workflow: {
       id: workflow.id,
       name: workflow.name,
diff --git a/apps/api/src/routes/endpoint-execute.ts b/apps/api/src/routes/endpoint-execute.ts
@@ -7,7 +7,7 @@ import {
   getEndpointById,
   getEndpointTriggersByEndpoint,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
   verifyApiKey,
 } from "../db";
 import { createRateLimitMiddleware } from "../middleware/rate-limit";
@@ -72,7 +72,6 @@ endpointExecuteRoutes.on(
     if (!billingInfo) {
       return c.json({ error: "Organization not found" }, 404);
     }
-    const { computeCredits, subscriptionStatus, overageLimit } = billingInfo;
 
     const workflowStore = new WorkflowStore(c.env);
     const executions: ExecuteWorkflowResponse[] = [];
@@ -112,11 +111,8 @@ endpointExecuteRoutes.on(
         },
         userId: "api_key",
         organizationId,
-        computeCredits,
-        subscriptionStatus: subscriptionStatus ?? undefined,
-        overageLimit: overageLimit ?? null,
+        ...resolveOrganizationBillingOptions(billingInfo, c.env.CLOUDFLARE_ENV),
         parameters,
-        userPlan: resolveOrganizationPlan(billingInfo, c.env.CLOUDFLARE_ENV),
         env: c.env,
       });
 
diff --git a/apps/api/src/routes/endpoints.ts b/apps/api/src/routes/endpoints.ts
@@ -23,7 +23,7 @@ import {
   getEndpoints,
   getEndpointTriggersByEndpoint,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
   updateEndpoint,
 } from "../db";
 import { createRateLimitMiddleware } from "../middleware/rate-limit";
@@ -230,7 +230,6 @@ endpointRoutes.on(
     if (!billingInfo) {
       return c.json({ error: "Organization not found" }, 404);
     }
-    const { computeCredits, subscriptionStatus, overageLimit } = billingInfo;
 
     const workflowStore = new WorkflowStore(c.env);
     const executions: ExecuteWorkflowResponse[] = [];
@@ -273,11 +272,8 @@ endpointRoutes.on(
         },
         userId,
         organizationId,
-        computeCredits,
-        subscriptionStatus: subscriptionStatus ?? undefined,
-        overageLimit: overageLimit ?? null,
+        ...resolveOrganizationBillingOptions(billingInfo, c.env.CLOUDFLARE_ENV),
         parameters,
-        userPlan: resolveOrganizationPlan(billingInfo, c.env.CLOUDFLARE_ENV),
         env: c.env,
       });
 
diff --git a/apps/api/src/routes/slack-webhook.ts b/apps/api/src/routes/slack-webhook.ts
@@ -8,7 +8,7 @@ import {
   getBotById,
   getBotTriggersByBot,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -293,8 +293,7 @@ async function executeWorkflow(
   const executionParams = {
     userId: "slack_trigger",
     organizationId,
-    computeCredits: billingInfo.computeCredits,
-    userPlan: resolveOrganizationPlan(billingInfo, env.CLOUDFLARE_ENV),
+    ...resolveOrganizationBillingOptions(billingInfo, env.CLOUDFLARE_ENV),
     workflow: {
       id: workflow.id,
       name: workflow.name,
diff --git a/apps/api/src/routes/telegram-webhook.ts b/apps/api/src/routes/telegram-webhook.ts
@@ -7,7 +7,7 @@ import {
   getBot,
   getBotTriggersByBot,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -220,8 +220,7 @@ async function executeWorkflow(
   const executionParams = {
     userId: "telegram_trigger",
     organizationId,
-    computeCredits: billingInfo.computeCredits,
-    userPlan: resolveOrganizationPlan(billingInfo, env.CLOUDFLARE_ENV),
+    ...resolveOrganizationBillingOptions(billingInfo, env.CLOUDFLARE_ENV),
     workflow: {
       id: workflow.id,
       name: workflow.name,
diff --git a/apps/api/src/routes/whatsapp-webhook.ts b/apps/api/src/routes/whatsapp-webhook.ts
@@ -8,7 +8,7 @@ import {
   getBotById,
   getBotTriggersByBot,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "../db";
 import { getAgentByName } from "../durable-objects/agent-utils";
 import { createWorkerRuntime } from "../runtime/cloudflare-worker-runtime";
@@ -331,8 +331,7 @@ async function executeWorkflow(
   const executionParams = {
     userId: "whatsapp_trigger",
     organizationId,
-    computeCredits: billingInfo.computeCredits,
-    userPlan: resolveOrganizationPlan(billingInfo, env.CLOUDFLARE_ENV),
+    ...resolveOrganizationBillingOptions(billingInfo, env.CLOUDFLARE_ENV),
     workflow: {
       id: workflow.id,
       name: workflow.name,
diff --git a/apps/api/src/routes/workflows.ts b/apps/api/src/routes/workflows.ts
@@ -45,7 +45,7 @@ import {
   getOrganizationBillingInfo,
   getQueue,
   getQueueTrigger,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
   upsertEndpointTrigger as upsertDbEndpointTrigger,
   upsertQueueTrigger as upsertDbQueueTrigger,
   workflows,
@@ -388,7 +388,6 @@ async function executeWorkflow(
   if (!billingInfo) {
     return c.json({ error: "Organization not found" }, 404);
   }
-  const { computeCredits, subscriptionStatus, overageLimit } = billingInfo;
 
   // Prepare workflow for execution
   const preparationResult = await prepareWorkflowExecution(c, workflowData);
@@ -410,11 +409,8 @@ async function executeWorkflow(
     },
     userId,
     organizationId,
-    computeCredits,
-    subscriptionStatus: subscriptionStatus ?? undefined,
-    overageLimit: overageLimit ?? null,
+    ...resolveOrganizationBillingOptions(billingInfo, c.env.CLOUDFLARE_ENV),
     parameters,
-    userPlan: resolveOrganizationPlan(billingInfo, c.env.CLOUDFLARE_ENV),
     env: c.env,
   });
 
diff --git a/apps/api/src/runtime/cloudflare-credit-service.ts b/apps/api/src/runtime/cloudflare-credit-service.ts
@@ -24,13 +24,20 @@ export class CloudflareCreditService implements CreditService {
       estimatedUsage,
       subscriptionStatus,
       overageLimit,
+      unlimitedUsage,
     } = params;
 
     // Skip credit limit enforcement in development mode
     if (this.isDevelopment) {
       return true;
     }
 
+    // Organizations flagged as unlimited (e.g., internal/test accounts) bypass
+    // all credit checks regardless of subscription state.
+    if (unlimitedUsage) {
+      return true;
+    }
+
     // Get current cumulative usage
     const currentUsage = await getOrganizationComputeUsage(
       this.kv,
diff --git a/apps/api/src/scheduled.ts b/apps/api/src/scheduled.ts
@@ -5,7 +5,7 @@ import {
   createDatabase,
   getActiveScheduledTriggers,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "./db";
 import { getAgentByName } from "./durable-objects/agent-utils";
 import { createWorkerRuntime } from "./runtime/cloudflare-worker-runtime";
@@ -73,8 +73,7 @@ export async function handleScheduledEvent(
       const executionParams = {
         userId: "scheduled_trigger",
         organizationId: workflow.organizationId,
-        computeCredits: billingInfo.computeCredits,
-        userPlan: resolveOrganizationPlan(billingInfo, env.CLOUDFLARE_ENV),
+        ...resolveOrganizationBillingOptions(billingInfo, env.CLOUDFLARE_ENV),
         workflow: {
           id: workflow.id,
           name: workflow.name,
diff --git a/apps/api/src/services/execution-manager.ts b/apps/api/src/services/execution-manager.ts
@@ -12,7 +12,7 @@ import { createDatabase } from "../db/index";
 import {
   getOrganization,
   getOrganizationBillingInfo,
-  resolveOrganizationPlan,
+  resolveOrganizationBillingOptions,
 } from "../db/queries";
 import {
   WorkflowExecutor,
@@ -54,7 +54,6 @@ export class ExecutionManager {
     if (!organization || !billingInfo) {
       throw new Error("Organization not found");
     }
-    const { computeCredits, subscriptionStatus, overageLimit } = billingInfo;
 
     validateWorkflowForExecution(state);
 
@@ -80,11 +79,11 @@ export class ExecutionManager {
       },
       userId,
       organizationId,
-      computeCredits,
-      subscriptionStatus: subscriptionStatus ?? undefined,
-      overageLimit: overageLimit ?? null,
+      ...resolveOrganizationBillingOptions(
+        billingInfo,
+        this.env.CLOUDFLARE_ENV
+      ),
       parameters: executorParameters,
-      userPlan: resolveOrganizationPlan(billingInfo, this.env.CLOUDFLARE_ENV),
       env: this.env,
     });
   }
diff --git a/apps/api/src/services/workflow-executor.ts b/apps/api/src/services/workflow-executor.ts
@@ -28,6 +28,8 @@ export interface WorkflowExecutorOptions {
   subscriptionStatus?: string;
   /** Maximum additional usage allowed beyond included credits. null = unlimited */
   overageLimit?: number | null;
+  /** When true, all credit checks are bypassed (e.g., internal/test accounts). */
+  unlimitedUsage?: boolean;
   parameters?: WorkflowExecutorParameters;
   userPlan?: string;
   env: Bindings;
@@ -72,6 +74,7 @@ export class WorkflowExecutor {
       computeCredits,
       subscriptionStatus,
       overageLimit,
+      unlimitedUsage,
       parameters,
       userPlan,
       env,
@@ -91,6 +94,7 @@ export class WorkflowExecutor {
       computeCredits,
       ...(subscriptionStatus && { subscriptionStatus }),
       ...(overageLimit !== undefined && { overageLimit }),
+      ...(unlimitedUsage !== undefined && { unlimitedUsage }),
       ...(userPlan && { userPlan }),
     };
 
diff --git a/packages/runtime/src/base-runtime.ts b/packages/runtime/src/base-runtime.ts
@@ -62,6 +62,8 @@ export interface RuntimeParams {
   readonly subscriptionStatus?: string;
   /** Maximum additional usage allowed beyond included credits. null = unlimited */
   readonly overageLimit?: number | null;
+  /** When true, all credit checks are bypassed (e.g., internal/test accounts). */
+  readonly unlimitedUsage?: boolean;
   readonly httpRequest?: HttpRequest;
   readonly emailMessage?: EmailMessage;
   readonly queueMessage?: QueueMessage;
@@ -260,6 +262,7 @@ export abstract class Runtime<Env = unknown> {
       computeCredits,
       subscriptionStatus,
       overageLimit,
+      unlimitedUsage,
       httpRequest,
       emailMessage,
       queueMessage,
@@ -397,6 +400,7 @@ export abstract class Runtime<Env = unknown> {
         estimatedUsage,
         subscriptionStatus,
         overageLimit,
+        unlimitedUsage,
       });
 
       if (!hasCredits) {
diff --git a/packages/runtime/src/credit-service.ts b/packages/runtime/src/credit-service.ts
@@ -11,6 +11,8 @@ export interface CreditCheckParams {
   subscriptionStatus?: string;
   /** Maximum overage allowed beyond included credits. null = unlimited */
   overageLimit?: number | null;
+  /** When true, all credit checks are bypassed (e.g., internal/test accounts). */
+  unlimitedUsage?: boolean;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-- Add unlimited_usage flag for organizations exempted from credit limits`
	`2`	`+-- (e.g., internal/test accounts without a Stripe subscription).`
	`3`	+ALTER TABLE `organizations` ADD COLUMN `unlimited_usage` integer DEFAULT false NOT NULL;