feat(billing): dual Stripe EE/US account support

.github/scripts/start-cloudflare-workers-with-retry.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+max_attempts="${CLOUDFLARE_WORKERS_START_MAX_ATTEMPTS:-2}"
+worker_port_offset="${CLOUDFLARE_WORKER_PORT_OFFSET:-0}"
+log_path="${CLOUDFLARE_WORKERS_LOG_PATH:-${RUNNER_TEMP:-/tmp}/cloudflare-workers.log}"
+wait_timeout_ms="${CLOUDFLARE_WORKERS_WAIT_TIMEOUT_MS:-180000}"
+worker_pids=()
+
+stop_worker_pid() {
+  local pid="$1"
+  if [[ -z "${pid}" ]]; then
+    return
+  fi
+  kill "${pid}" 2>/dev/null || true
+  pkill -P "${pid}" 2>/dev/null || true
+}
+
+stop_all_worker_pids() {
+  local pid
+  for pid in "${worker_pids[@]}"; do
+    stop_worker_pid "${pid}"
+  done
+}
+
+export BACKGROUND_SERVICE_NAME="${BACKGROUND_SERVICE_NAME:-Cloudflare Workers}"
+export BACKGROUND_RUN_COMMAND="${BACKGROUND_RUN_COMMAND:-$'chmod +x scripts/start-cloudflare-workers.sh\nexec ./scripts/start-cloudflare-workers.sh'}"
+export BACKGROUND_LOG_PATH="${log_path}"
+export BACKGROUND_WAIT_TIMEOUT_MS="${wait_timeout_ms}"
+export BACKGROUND_TAIL_LINES="${BACKGROUND_TAIL_LINES:-400}"
+export BACKGROUND_WAIT_ON="http-get://127.0.0.1:$((8787 + worker_port_offset))/ok
+http-get://127.0.0.1:$((8788 + worker_port_offset))/ok
+http-get://127.0.0.1:$((8789 + worker_port_offset))/ok"
+
+for attempt in $(seq 1 "${max_attempts}"); do
+  if bash .github/scripts/start-background-service.sh; then
+    exit 0
+  else
+    exit_code=$?
+    if [[ -n "${GITHUB_OUTPUT:-}" ]] && [[ -f "${GITHUB_OUTPUT}" ]]; then
+      latest_pid="$(grep '^pid=' "${GITHUB_OUTPUT}" | tail -1 | cut -d= -f2- || true)"
+      if [[ -n "${latest_pid}" ]]; then
+        worker_pids+=("${latest_pid}")
+        stop_worker_pid "${latest_pid}"
+      fi
+    fi
+    echo "Cloudflare Workers failed to become ready with exit ${exit_code} (attempt ${attempt}/${max_attempts})" >&2
+    if [ "${attempt}" -eq "${max_attempts}" ]; then
+      stop_all_worker_pids
+      exit "${exit_code}"
+    fi
+    sleep_seconds=$((attempt * 10))
+    echo "Retrying Cloudflare Workers startup in ${sleep_seconds}s..." >&2
+    sleep "${sleep_seconds}"
+  fi
+done

.github/scripts/start-supabase-worktree-with-retry.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+max_attempts="${SUPABASE_START_MAX_ATTEMPTS:-3}"
+exclude_services="${SUPABASE_START_EXCLUDE:-imgproxy,studio,mailpit,realtime,postgres-meta,supavisor,logflare,vector}"
+
+for attempt in $(seq 1 "${max_attempts}"); do
+  bun scripts/supabase-worktree.ts stop --no-backup || true
+  if bun scripts/supabase-worktree.ts start -x "${exclude_services}"; then
+    exit 0
+  else
+    exit_code=$?
+    echo "Supabase start failed with exit ${exit_code} (attempt ${attempt}/${max_attempts})" >&2
+    if [ "${attempt}" -eq "${max_attempts}" ]; then
+      exit "${exit_code}"
+    fi
+    sleep_seconds=$((attempt * 5))
+    echo "Retrying Supabase start in ${sleep_seconds}s..." >&2
+    sleep "${sleep_seconds}"
+  fi
+done

.github/workflows/tests.yml

@@ -418,7 +418,7 @@ jobs:
           warm_get() {
             local path="$1"
             for attempt in 1 2 3 4 5; do
-              status=$(curl -s -o /tmp/edge-warm.body -w '%{http_code}' "${base_url}${path}" || true)
+              status=$(curl --max-time 10 -s -o /tmp/edge-warm.body -w '%{http_code}' "${base_url}${path}" || true)
               echo "edge warm GET path=${path} attempt=${attempt} status=${status}"
               if [ "${status}" != "502" ] && [ "${status}" != "503" ] && [ "${status}" != "000" ]; then
                 return 0
@@ -430,7 +430,7 @@ jobs:
           warm_post() {
             local path="$1"
             for attempt in 1 2 3 4 5; do
-              status=$(curl -s -o /tmp/edge-warm.body -w '%{http_code}' -X POST "${base_url}${path}" \
+              status=$(curl --max-time 10 -s -o /tmp/edge-warm.body -w '%{http_code}' -X POST "${base_url}${path}" \
                 -H 'Content-Type: application/json' \
                 -H 'apisecret: testsecret' \
                 -d '{}' || true)
@@ -742,7 +742,7 @@ jobs:
     needs: [changes, lint_typecheck, dead_code]
     if: needs.changes.outputs.run_capgo == 'true'
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 7
     name: Run Cloudflare Workers tests (shard ${{ matrix.shard }})
     permissions:
       contents: read
@@ -813,7 +813,7 @@ jobs:
       - name: Install dependencies
         run: bun install
       - name: Run Supabase Start
-        run: bun scripts/supabase-worktree.ts start -x imgproxy,studio,mailpit,realtime,postgres-meta,supavisor,logflare,vector
+        run: bash .github/scripts/start-supabase-worktree-with-retry.sh
       - name: Export isolated test endpoints
         run: |
           {
@@ -835,20 +835,7 @@ jobs:
           bash .github/scripts/start-background-service.sh
       - id: start_cloudflare_workers
         name: Start Cloudflare Workers for testing
-        env:
-          BACKGROUND_SERVICE_NAME: Cloudflare Workers
-          BACKGROUND_RUN_COMMAND: |
-            chmod +x scripts/start-cloudflare-workers.sh
-            exec ./scripts/start-cloudflare-workers.sh
-          BACKGROUND_LOG_PATH: ${{ runner.temp }}/cloudflare-workers.log
-          BACKGROUND_WAIT_TIMEOUT_MS: 120000
-          BACKGROUND_TAIL_LINES: 400
-        run: |
-          worker_port_offset="${CLOUDFLARE_WORKER_PORT_OFFSET:-0}"
-          export BACKGROUND_WAIT_ON="http-get://127.0.0.1:$((8787 + worker_port_offset))/ok
-          http-get://127.0.0.1:$((8788 + worker_port_offset))/ok
-          http-get://127.0.0.1:$((8789 + worker_port_offset))/ok"
-          bash .github/scripts/start-background-service.sh
+        run: bash .github/scripts/start-cloudflare-workers-with-retry.sh
       - name: Run Cloudflare Workers integration tests
         env:
           VITEST_SHARD: ${{ matrix.shard }}
@@ -885,7 +872,7 @@ jobs:
     needs: [changes, lint_typecheck, dead_code]
     if: needs.changes.outputs.run_capgo == 'true'
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 7
     name: Run Cloudflare plugin tests (serial)
     permissions:
       contents: read
@@ -919,7 +906,7 @@ jobs:
       - name: Install dependencies
         run: bun install
       - name: Run Supabase Start
-        run: bun scripts/supabase-worktree.ts start -x imgproxy,studio,mailpit,realtime,postgres-meta,supavisor,logflare,vector
+        run: bash .github/scripts/start-supabase-worktree-with-retry.sh
       - name: Export isolated test endpoints
         run: |
           {
@@ -941,19 +928,8 @@ jobs:
       - id: start_cloudflare_workers
         name: Start Cloudflare Workers for testing
         env:
-          BACKGROUND_SERVICE_NAME: Cloudflare Workers
-          BACKGROUND_RUN_COMMAND: |
-            chmod +x scripts/start-cloudflare-workers.sh
-            exec ./scripts/start-cloudflare-workers.sh
-          BACKGROUND_LOG_PATH: ${{ runner.temp }}/cloudflare-plugin-workers.log
-          BACKGROUND_WAIT_TIMEOUT_MS: 120000
-          BACKGROUND_TAIL_LINES: 400
-        run: |
-          worker_port_offset="${CLOUDFLARE_WORKER_PORT_OFFSET:-0}"
-          export BACKGROUND_WAIT_ON="http-get://127.0.0.1:$((8787 + worker_port_offset))/ok
-          http-get://127.0.0.1:$((8788 + worker_port_offset))/ok
-          http-get://127.0.0.1:$((8789 + worker_port_offset))/ok"
-          bash .github/scripts/start-background-service.sh
+          CLOUDFLARE_WORKERS_LOG_PATH: ${{ runner.temp }}/cloudflare-plugin-workers.log
+        run: bash .github/scripts/start-cloudflare-workers-with-retry.sh
       - name: Warm plugin /updates endpoint
         run: |
           plugin_url="http://127.0.0.1:$((8788 + CLOUDFLARE_WORKER_PORT_OFFSET))/updates"
@@ -1503,6 +1479,45 @@ jobs:
         run: |
           export BACKGROUND_WAIT_ON="${SUPABASE_FUNCTIONS_HEALTH_URL:?Missing isolated Supabase health URL}"
           bash .github/scripts/start-background-service.sh
+      - name: Warm edge functions before CLI integration tests
+        run: |
+          # GET /ok alone is not enough — cold first requests under file parallelism 502.
+          health_url="${SUPABASE_FUNCTIONS_HEALTH_URL#http-get://}"
+          health_url="${health_url#https-get://}"
+          base_url="http://${health_url%/ok}"
+          warm_get() {
+            local path="$1"
+            for attempt in 1 2 3 4 5; do
+              status=$(curl --max-time 10 -s -o /tmp/edge-warm.body -w '%{http_code}' "${base_url}${path}" || true)
+              echo "edge warm GET path=${path} attempt=${attempt} status=${status}"
+              if [ "${status}" != "502" ] && [ "${status}" != "503" ] && [ "${status}" != "000" ]; then
+                return 0
+              fi
+              sleep "${attempt}"
+            done
+            return 1
+          }
+          warm_post() {
+            local path="$1"
+            for attempt in 1 2 3 4 5; do
+              status=$(curl --max-time 10 -s -o /tmp/edge-warm.body -w '%{http_code}' -X POST "${base_url}${path}" \
+                -H 'Content-Type: application/json' \
+                -H 'apisecret: testsecret' \
+                -d '{}' || true)
+              echo "edge warm POST path=${path} attempt=${attempt} status=${status}"
+              if [ "${status}" != "502" ] && [ "${status}" != "503" ] && [ "${status}" != "000" ]; then
+                return 0
+              fi
+              sleep "${attempt}"
+            done
+            return 1
+          }
+          warm_get /ok
+          warm_post /triggers/cron_email
+          warm_post /triggers/cron_stat_org
+          warm_post /triggers/cron_stat_app
+          warm_post /apikey
+          warm_post /app
       - name: Run Capgo CLI integration tests
         run: |
           bun run supabase:with-env -- bunx vitest run tests/cli* --exclude=tests/cli-min-version.test.ts --exclude=tests/cli-new-encryption.test.ts

BOUNTY.md

@@ -25,9 +25,6 @@
 
 Anyone from the community can review the pull request and leave comments.
 
-Review are rewarded with a tip of $20 when requested on merged pull request.
-AI review does not qualify.
-
 ## What is a good review?
 
 Check code pattern repetition, and things that can be done better.

cli/src/types/supabase.types.ts

@@ -2267,6 +2267,7 @@ export type Database = {
           build_time_unit: number
           created_at: string
           credit_id: string
+          credit_id_us: string | null
           description: string
           id: string
           market_desc: string | null
@@ -2277,15 +2278,19 @@ export type Database = {
           price_m_id: string
           price_y: number
           price_y_id: string
+          price_y_id_us: string | null
+          price_m_id_us: string | null
           storage: number
           stripe_id: string
+          stripe_id_us: string | null
           updated_at: string
         }
         Insert: {
           bandwidth: number
           build_time_unit?: number
           created_at?: string
           credit_id: string
+          credit_id_us?: string | null
           description?: string
           id?: string
           market_desc?: string | null
@@ -2296,15 +2301,19 @@ export type Database = {
           price_m_id: string
           price_y?: number
           price_y_id: string
+          price_y_id_us?: string | null
+          price_m_id_us?: string | null
           storage: number
           stripe_id?: string
+          stripe_id_us?: string | null
           updated_at?: string
         }
         Update: {
           bandwidth?: number
           build_time_unit?: number
           created_at?: string
           credit_id?: string
+          credit_id_us?: string | null
           description?: string
           id?: string
           market_desc?: string | null
@@ -2315,8 +2324,11 @@ export type Database = {
           price_m_id?: string
           price_y?: number
           price_y_id?: string
+          price_y_id_us?: string | null
+          price_m_id_us?: string | null
           storage?: number
           stripe_id?: string
+          stripe_id_us?: string | null
           updated_at?: string
         }
         Relationships: []
@@ -2642,6 +2654,7 @@ export type Database = {
       stripe_info: {
         Row: {
           bandwidth_exceeded: boolean | null
+          billing_account: string
           build_time_exceeded: boolean | null
           canceled_at: string | null
           churn_reason: string | null
@@ -2669,6 +2682,7 @@ export type Database = {
         }
         Insert: {
           bandwidth_exceeded?: boolean | null
+          billing_account?: string
           build_time_exceeded?: boolean | null
           canceled_at?: string | null
           churn_reason?: string | null
@@ -2696,6 +2710,7 @@ export type Database = {
         }
         Update: {
           bandwidth_exceeded?: boolean | null
+          billing_account?: string
           build_time_exceeded?: boolean | null
           canceled_at?: string | null
           churn_reason?: string | null
@@ -2721,15 +2736,7 @@ export type Database = {
           updated_at?: string
           upgraded_at?: string | null
         }
-        Relationships: [
-          {
-            foreignKeyName: "stripe_info_product_id_fkey"
-            columns: ["product_id"]
-            isOneToOne: false
-            referencedRelation: "plans"
-            referencedColumns: ["stripe_id"]
-          },
-        ]
+        Relationships: []
       }
       trial_extension_events: {
         Row: {

cloudflare_workers/api/index.ts

@@ -95,6 +95,7 @@ import { app as pluginNotifications } from '../../supabase/functions/_backend/tr
 import { app as queue_consumer } from '../../supabase/functions/_backend/triggers/queue_consumer.ts'
 import { app as send_email } from './triggers/send_email.ts'
 import { app as stripe_event } from '../../supabase/functions/_backend/triggers/stripe_event.ts'
+import { app as stripe_event_us } from '../../supabase/functions/_backend/triggers/stripe_event_us.ts'
 import { app as webhook_delivery } from '../../supabase/functions/_backend/triggers/webhook_delivery.ts'
 import { app as webhook_dispatcher } from '../../supabase/functions/_backend/triggers/webhook_dispatcher.ts'
 import { BRES, createAllCatch, createHono } from '../../supabase/functions/_backend/utils/hono.ts'
@@ -220,6 +221,7 @@ appTriggers.route('/on_version_delete', on_version_delete)
 appTriggers.route('/on_manifest_create', on_manifest_create)
 appTriggers.route('/on_deploy_history_create', on_deploy_history_create)
 appTriggers.route('/stripe_event', stripe_event)
+appTriggers.route('/stripe_event_us', stripe_event_us)
 appTriggers.route('/on_organization_create', on_organization_create)
 appTriggers.route('/cron_stat_app', cron_stat_app)
 appTriggers.route('/cron_stat_org', cron_stat_org)

read_replicate/schema_replicate.catalog.json

@@ -1819,6 +1819,16 @@
       "position": 26,
       "table": "stripe_info",
       "type": "boolean"
+    },
+    {
+      "default": "'ee'::text",
+      "generated": "",
+      "identity": "",
+      "name": "billing_account",
+      "notNull": true,
+      "position": 27,
+      "table": "stripe_info",
+      "type": "text"
     }
   ],
   "constraints": [
@@ -2067,6 +2077,13 @@
       "type": "u",
       "valid": true
     },
+    {
+      "definition": "CHECK (billing_account = ANY (ARRAY['ee'::text, 'us'::text]))",
+      "name": "stripe_info_billing_account_check",
+      "table": "stripe_info",
+      "type": "c",
+      "valid": true
+    },
     {
       "definition": "PRIMARY KEY (customer_id)",
       "name": "stripe_info_pkey",

read_replicate/schema_replicate.sql

@@ -446,7 +446,9 @@ CREATE TABLE public.stripe_info (
     last_stripe_event_at timestamp with time zone,
     past_due_at timestamp with time zone,
     churn_reason text,
-    is_above_plan boolean
+    is_above_plan boolean,
+    billing_account text DEFAULT 'ee'::text NOT NULL,
+    CONSTRAINT stripe_info_billing_account_check CHECK ((billing_account = ANY (ARRAY['ee'::text, 'us'::text])))
 );
 
 ALTER TABLE ONLY public.stripe_info REPLICA IDENTITY FULL;