improvement(billing): duplicate checks for bypasses, logger billing actor consistency, run from block

[icecrasher321]

Summary

• Run from block should call preprocess executions for billing checks
• Duplicate active subs should loudly error
• Logger should hit billing actor similar to preprocess
• Consolidate into helpers for dup checks, block/unblock users

Type of Change

• Bug fix
• Other: Code Improvement

Testing

Tested manually

Checklist

• Code follows project style guidelines
• Self-reviewed my changes
• Tests added/updated and passing
• No new warnings introduced
• I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
docs	Skipped		Feb 2, 2026 6:12pm

[greptile-apps]

Greptile Overview

Greptile Summary

This PR strengthens billing integrity by adding duplicate subscription checks, ensuring billing actor consistency, and extending billing enforcement to run-from-block executions.

Key Changes

• Run-from-block billing enforcement: execute-from-block route now calls preprocessExecution to enforce billing checks, usage limits, and rate limits before execution
• Duplicate subscription prevention: Added hasActiveSubscription checks across checkout, subscription transfer, and organization creation flows to prevent multiple active subscriptions on the same referenceId
• Logger billing consistency: ExecutionLogger now uses workspace billed account resolution (via getWorkspaceBilledAccountUserId) matching the preprocessing logic
• Consolidated blocking helpers: Created blockOrgMembers and unblockOrgMembers functions to centralize organization member blocking/unblocking logic
• Enhanced dispute handling: Dispute webhook now blocks all org members (not just owner) and handles warning_closed status for unblocking
• Organization deletion safety: Subscription deletion now checks for other active subscriptions before deleting organizations

Architecture Impact

The changes consolidate billing logic into reusable helpers and ensure consistent billing actor resolution across execution paths. The duplicate subscription checks create multiple defense layers at authorization, checkout, transfer, and organization creation points.

Confidence Score: 5/5

• Safe to merge - improves billing integrity with defensive checks
• All changes are defensive improvements to billing logic. The duplicate subscription checks prevent edge cases, billing actor consistency ensures correct cost attribution, and the run-from-block enforcement closes a bypass. Code is well-structured with proper error handling.
• No files require special attention

Important Files Changed

Filename	Overview
apps/sim/app/api/workflows/[id]/execute-from-block/route.ts	Added preprocessExecution call to enforce billing checks, rate limits, and usage limits for run-from-block executions
apps/sim/lib/logs/execution/logger.ts	Updated to use workspace billed account for cost tracking, matching billing actor logic from preprocessing
apps/sim/lib/billing/organizations/membership.ts	Added helper functions blockOrgMembers, unblockOrgMembers, and getOrgMemberIds to centralize organization member blocking logic
apps/sim/lib/billing/authorization.ts	Added duplicate subscription check in authorization to prevent multiple active subscriptions on same referenceId
apps/sim/lib/billing/webhooks/invoices.ts	Refactored to use blockOrgMembers and unblockOrgMembers helpers for consistent member blocking on payment failures

Sequence Diagram

sequenceDiagram
participant Client
participant ExecuteAPI as Execute-from-Block API
participant Preprocessing as preprocessExecution
participant Billing as Billing Module
participant Logger as ExecutionLogger
participant DB as Database
Client->>ExecuteAPI: POST /workflows/{id}/execute-from-block
ExecuteAPI->>Preprocessing: Check billing & limits
Preprocessing->>DB: Fetch workflow record
DB-->>Preprocessing: Workflow details
Preprocessing->>Billing: Get workspace billed account
Billing-->>Preprocessing: actorUserId
Preprocessing->>Billing: Check usage limits
Billing-->>Preprocessing: Usage check result
alt Usage exceeded or blocked
Preprocessing-->>ExecuteAPI: Error (402/403)
ExecuteAPI-->>Client: Execution blocked
else Checks passed
Preprocessing-->>ExecuteAPI: Success with actorUserId
ExecuteAPI->>ExecuteAPI: Execute workflow
ExecuteAPI->>Logger: Log execution with costs
Logger->>Billing: Get workspace billed account
Billing-->>Logger: billingUserId
Logger->>DB: Update userStats (billing actor)
DB-->>Logger: Updated
Logger-->>ExecuteAPI: Logged
ExecuteAPI-->>Client: Execution result
end

Loading

[greptile-apps]

_{5 files reviewed, no comments}

_{Edit Code Review Agent Settings | Greptile}

[icecrasher321]

@cursor review

[icecrasher321]

@cursor review

[icecrasher321]

@cursor review

[cursor]

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR