@funnelsgrove/cli 0.1.247 → 0.1.255

package/funnel-contract-compatibility.json

@@ -4,10 +4,10 @@
   "minimumCliVersion": "0.1.20",
   "entries": [
     {
-      "repositoryCliVersion": "0.1.247",
+      "repositoryCliVersion": "0.1.255",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.239",
+        "bundleVersion": "2.0.248",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -45,7 +45,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "11793bcf78f66bea46242cd3bb58d09b3db6a03f6d76dffe5539c1e12958be2d"
+            "sha256": "19ea25028aebc54e553c223385ed1bf704a4f2bdef817250e01e566866034673"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -145,16 +145,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "46eb16ad05f0e757c89710cde7ed3fd5c229a935d93e36bf30d75f3b39858d32"
+            "sha256": "07db87377a3d12b6bcf119d01bebffbbbb4702bb3cf83b8059132adbd2486a21"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.246",
+      "repositoryCliVersion": "0.1.254",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.238",
+        "bundleVersion": "2.0.247",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -192,7 +192,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "4bc62e599ad4eda8c666aadc82e521ab87132b19b905d1ac18d7eefe7094a117"
+            "sha256": "2aac7c053f6c267c5a6e6116d8d0c2358f490bbc3b40e2c01db2e4150edfa4d1"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -292,16 +292,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "d338125ed0a8785013323045c54b427bfd542fd0dd3b573b241b3cbc73b185ab"
+            "sha256": "0fdce657b56fb7e0a986a4bfb36abc8791203c1b0817655c15edb93883ec22f8"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.245",
+      "repositoryCliVersion": "0.1.253",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.237",
+        "bundleVersion": "2.0.246",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -339,7 +339,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "0a4f03f3437c6973350e353122701fec1364cdf49903fc36b06fb83b9d605ad5"
+            "sha256": "ad4da659c3e0ea1f35488d74787d3c8dee3da8f9cffda03887855221797155e9"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -439,16 +439,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "2a137b30ed46e19a2d4fde0818279e3d22c763033034e1b02a89d46d8309b4ca"
+            "sha256": "e3e3fdaf03b9dd63fae770038c20a7353c506fca85823f53118d014510ffa097"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.244",
+      "repositoryCliVersion": "0.1.252",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.236",
+        "bundleVersion": "2.0.245",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -486,7 +486,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "ef25e231799f18a0fe8e1491aadea02409dc7f191578049c776682cc29e89f22"
+            "sha256": "659e22a9a9518f350aceaa142c4f3ea2e21d6a4565b0946df45fde3222cc759d"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -586,16 +586,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "4883212ae45dc8d7c340c01b661d39398aa52e0296d9a83be2c0f773ccf5b639"
+            "sha256": "d3e5ed25c5cf968cf55b82f00397898d3b7988dd17106cba34ad901e113f9678"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.243",
+      "repositoryCliVersion": "0.1.251",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.235",
+        "bundleVersion": "2.0.244",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -633,7 +633,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "18009bf0121c52202539db3a14826b5dd5a086786751c8af5175f630e770965e"
+            "sha256": "19bb286f5de372c3111fd0fa0b2c398643783b099b8e82ea5d38781788a2929b"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -733,16 +733,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "f91824a677e5761698b1b14068171e787cc81436b3fc0bcd4f2ee47590a9f067"
+            "sha256": "98784693ce1f52e6358fc960344bb0010f266d08acd41ebbd794cf8f7ce029ca"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.242",
+      "repositoryCliVersion": "0.1.250",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.234",
+        "bundleVersion": "2.0.243",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -780,7 +780,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "56cdd406e7665622cba6ad89347cfe6cfed266eca67abcaca2face23d936d505"
+            "sha256": "929819e1f8ccbdef0a748185d8ac08d71334ad98142f2c4f2c3f965b319b9f8e"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -880,16 +880,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "2f8464a0591085c1419fa72e65242cd6dfb9c159ac81206df7b04e1d0076a2e2"
+            "sha256": "7da81e80573f3af5d89e52c5c1fa5e7df5c5cac0de699345c0ecdf4d359f51c9"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.241",
+      "repositoryCliVersion": "0.1.249",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.233",
+        "bundleVersion": "2.0.242",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -927,7 +927,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "863351c3fe7cf56a93fc0b76c583c350ff0f1b950b3391681552fd48b4bb48f7"
+            "sha256": "fd1c2321f5f59bc93a2580c5868b46c57cce679b0055712654e29ca26e636a50"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -1027,7 +1027,7 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "8f4c7cf116e1da997c1ed8b80dd356c9e808cab26132144dde197500723c8253"
+            "sha256": "7608c4cbd9bd67075d2db5a983134dc1f06d9fc1d779ebd8fe84bf44a015b035"
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/cli",
-  "version": "0.1.247",
+  "version": "0.1.255",
   "description": "FunnelsGrove command-line tools for editing, syncing, and publishing funnels",
   "repository": {
     "type": "git",
@@ -34,14 +34,14 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@funnelsgrove/runtime": "0.19.1",
+    "@funnelsgrove/runtime": "0.21.1",
     "commander": "^12.0.0",
     "ignore": "^7.0.8",
     "typescript": "^5.8.3"
   },
   "devDependencies": {
-    "@funnelsgrove/analytics": "0.2.0",
-    "@funnelsgrove/payments": "0.22.1",
+    "@funnelsgrove/analytics": "0.4.1",
+    "@funnelsgrove/payments": "0.23.2",
     "vitest": "^3.0.0"
   }
 }

package/template_docs/.funnelsgrove-docs.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.239",
+  "bundleVersion": "2.0.248",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "11793bcf78f66bea46242cd3bb58d09b3db6a03f6d76dffe5539c1e12958be2d"
+      "sha256": "19ea25028aebc54e553c223385ed1bf704a4f2bdef817250e01e566866034673"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "46eb16ad05f0e757c89710cde7ed3fd5c229a935d93e36bf30d75f3b39858d32"
+      "sha256": "07db87377a3d12b6bcf119d01bebffbbbb4702bb3cf83b8059132adbd2486a21"
     }
   ]
 }

package/template_docs/docs/funnelsgrove/migrations/step-contract-v3.md

@@ -17,7 +17,7 @@ Supported read versions: `1`, `2`, `3`. Authoring and publish target version `3`
 
 ### Package release order
 
-Release `@funnelsgrove/sdk` `0.4.0` first, then `@funnelsgrove/runtime` `0.20.1`, then `@funnelsgrove/analytics` `0.3.0`, then `@funnelsgrove/payments` `0.22.4`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.247`, and only then promotes the candidate to production traffic. The serving API must never advertise an unpublished preferred CLI. Publishing packages and deploying production remain separately approved operational actions.
+Release `@funnelsgrove/sdk` `0.4.0` first, then `@funnelsgrove/runtime` `0.21.1`, then `@funnelsgrove/analytics` `0.4.1`, then `@funnelsgrove/payments` `0.23.2`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.255`, and only then promotes the candidate to production traffic. The serving API must never advertise an unpublished preferred CLI. Publishing packages and deploying production remain separately approved operational actions.
 <!-- funnelsgrove:generated:end contract-v3/migration/step-contract-v3 -->
 
 ## Version-last policy

package/template_docs/funnel-docs.config.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.239",
+  "bundleVersion": "2.0.248",
   "contractSource": "funnelsgrove-repository://apps/funnel-runtime/contracts/step-contract-v2.json",
   "fullyGenerated": [
     ".funnelsgrove-docs.json",

package/template_scaffold/.funnelsgrove-docs.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.239",
+  "bundleVersion": "2.0.248",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "11793bcf78f66bea46242cd3bb58d09b3db6a03f6d76dffe5539c1e12958be2d"
+      "sha256": "19ea25028aebc54e553c223385ed1bf704a4f2bdef817250e01e566866034673"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "46eb16ad05f0e757c89710cde7ed3fd5c229a935d93e36bf30d75f3b39858d32"
+      "sha256": "07db87377a3d12b6bcf119d01bebffbbbb4702bb3cf83b8059132adbd2486a21"
     }
   ]
 }

package/template_scaffold/.funnelsgrove-scaffold.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 1,
-  "sourceTreeHash": "c4a7b5855fcbccb601c5a2d1c603e04c0de96625b13e637cbb366c3b36115535",
+  "sourceTreeHash": "c3035a50bb6a37cbe8545129ac71167ceb858d612f5c26d488c520d5924415f0",
   "stepContractVersion": 3,
-  "docsBundleVersion": "2.0.239",
+  "docsBundleVersion": "2.0.248",
   "files": [
     {
       "path": ".env.example",
@@ -16,7 +16,7 @@
     },
     {
       "path": ".funnelsgrove-docs.json",
-      "sha256": "1abdb8e1df8ba8dfd5215859b403b4536872dd69a586033bccdaa263cf43bfc2",
+      "sha256": "21e4af4b5c474d7d4ec3574da7d34fce72b9d854478de61ea84610fe76231f50",
       "mode": "100644"
     },
     {
@@ -76,7 +76,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "11793bcf78f66bea46242cd3bb58d09b3db6a03f6d76dffe5539c1e12958be2d",
+      "sha256": "19ea25028aebc54e553c223385ed1bf704a4f2bdef817250e01e566866034673",
       "mode": "100644"
     },
     {
@@ -206,7 +206,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "46eb16ad05f0e757c89710cde7ed3fd5c229a935d93e36bf30d75f3b39858d32",
+      "sha256": "07db87377a3d12b6bcf119d01bebffbbbb4702bb3cf83b8059132adbd2486a21",
       "mode": "100644"
     },
     {
@@ -214,6 +214,11 @@
       "sha256": "6b5f7891fa9ef74e63d6b06f19a20c3aa3184a61541b76e18da4ce366e5faed8",
       "mode": "100644"
     },
+    {
+      "path": "funnel.runtime-capabilities.json",
+      "sha256": "3d74683170fced7afa9badfdf837706aac9c3d554690708b3ba31b009028a069",
+      "mode": "100644"
+    },
     {
       "path": "gitignore.template",
       "sha256": "3a92bf7904de32466cfc5521796fe60bcde1301b88f88e1417709060041e2aec",
@@ -231,12 +236,12 @@
     },
     {
       "path": "package-lock.json",
-      "sha256": "1a2be5a5642efecb5ac4a37b9bfb27d9bb57eb62434d1d55396ea8cbd7c0c840",
+      "sha256": "cd9436fe9d8f31d32377ecf74254c8db0779eac12f23e41f5466dc9a8d85c91e",
       "mode": "100644"
     },
     {
       "path": "package.json",
-      "sha256": "e5a2862caeb8e58234129bd55743fba93d6a414e60fc7360679b7d24c103c289",
+      "sha256": "2e2f22b65bba762d82f76993fd318098756c2191a6455760fb044395f2a43d34",
       "mode": "100644"
     },
     {
@@ -291,7 +296,12 @@
     },
     {
       "path": "src/components/FunnelFlow.tsx",
-      "sha256": "64424cf80a192ccec542ed1a188ab143a2bb33261a8717b8daa50726c848f0d3",
+      "sha256": "d85147018449917e0770fc00d479305b4f805323b1754a5ee1d0ea4a2e780840",
+      "mode": "100644"
+    },
+    {
+      "path": "src/components/StripeFraudDetection.tsx",
+      "sha256": "caad37065e53a6907dca8a556a08573d24736dccaf7c54d61aa2a74694883536",
       "mode": "100644"
     },
     {
@@ -311,12 +321,12 @@
     },
     {
       "path": "src/config/billing.plans.ts",
-      "sha256": "71a268bbefd624b58f5d63a66a4f35c36973931ddac4f3f49d38f03576dbe36a",
+      "sha256": "a6cc4720de70f47a2c0ffe85be1fc47b53b85eb85d5bb2e750aefe970fbede31",
       "mode": "100644"
     },
     {
       "path": "src/config/billing.test.plans.ts",
-      "sha256": "921f3c2e523606f292091762501f256b87479461fbf4e6327cd8fc0c8fb10a68",
+      "sha256": "d4adecf2de68970886cc6df4d34d26f0db299965e6005ce32a6215a3b48e5f84",
       "mode": "100644"
     },
     {
@@ -471,7 +481,7 @@
     },
     {
       "path": "src/steps/content/step-32-paywall.content.ts",
-      "sha256": "1a763425633ad6b8ece3d8f800f4272a72e7dc93cf845d379e9f23faee0d4cd5",
+      "sha256": "82d7ddca72c40d29a8509e856fb4a05b96faaab7befecb89c410f8ee43a95e12",
       "mode": "100644"
     },
     {
@@ -496,7 +506,7 @@
     },
     {
       "path": "src/steps/editor/step-32-paywall.editor.ts",
-      "sha256": "9f6d5d126b456dc59ffe6f9f374b7e3325dd43f80edf8906b6715bb97eae3744",
+      "sha256": "e544665b1e0ae7b121630fab9c1de33b88dfd8f3835bf3f12ac2438f7cbd220a",
       "mode": "100644"
     },
     {
@@ -541,7 +551,7 @@
     },
     {
       "path": "src/steps/step-32-paywall.tsx",
-      "sha256": "46d1a44a37b71f4e73fe5dd7d6ff4d3956929943364b1d285caa9e6846d213a9",
+      "sha256": "bebf58e628bf55a7b90d326dbde2b767b2b7054635d4354dc4b6202f96825219",
       "mode": "100644"
     },
     {

package/template_scaffold/docs/funnelsgrove/migrations/step-contract-v3.md

@@ -17,7 +17,7 @@ Supported read versions: `1`, `2`, `3`. Authoring and publish target version `3`
 
 ### Package release order
 
-Release `@funnelsgrove/sdk` `0.4.0` first, then `@funnelsgrove/runtime` `0.20.1`, then `@funnelsgrove/analytics` `0.3.0`, then `@funnelsgrove/payments` `0.22.4`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.247`, and only then promotes the candidate to production traffic. The serving API must never advertise an unpublished preferred CLI. Publishing packages and deploying production remain separately approved operational actions.
+Release `@funnelsgrove/sdk` `0.4.0` first, then `@funnelsgrove/runtime` `0.21.1`, then `@funnelsgrove/analytics` `0.4.1`, then `@funnelsgrove/payments` `0.23.2`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.255`, and only then promotes the candidate to production traffic. The serving API must never advertise an unpublished preferred CLI. Publishing packages and deploying production remain separately approved operational actions.
 <!-- funnelsgrove:generated:end contract-v3/migration/step-contract-v3 -->
 
 ## Version-last policy

package/template_scaffold/funnel-docs.config.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.239",
+  "bundleVersion": "2.0.248",
   "contractSource": "funnelsgrove-repository://apps/funnel-runtime/contracts/step-contract-v2.json",
   "fullyGenerated": [
     ".funnelsgrove-docs.json",

package/template_scaffold/funnel.runtime-capabilities.json

@@ -0,0 +1,4 @@
+{
+  "moneyContractVersion": 1,
+  "localeContractVersion": 1
+}

package/template_scaffold/package-lock.json

@@ -8,9 +8,9 @@
       "name": "funnel-template",
       "version": "0.1.0",
       "dependencies": {
-        "@funnelsgrove/analytics": "^0.2.0",
-        "@funnelsgrove/payments": "^0.22.1",
-        "@funnelsgrove/runtime": "^0.19.1",
+        "@funnelsgrove/analytics": "^0.4.1",
+        "@funnelsgrove/payments": "^0.23.2",
+        "@funnelsgrove/runtime": "^0.21.1",
         "@stripe/react-stripe-js": "^5.6.0",
         "@stripe/stripe-js": "^8.7.0",
         "lucide-react": "^0.553.0",
@@ -24,8 +24,10 @@
         "@types/node": "^20",
         "@types/react": "^19",
         "@types/react-dom": "^19",
+        "esbuild": "0.28.1",
         "eslint": "^9",
         "eslint-config-next": "16.1.6",
+        "playwright": "1.58.2",
         "typescript": "^5",
         "vite-node": "3.2.4",
         "vitest": "^3.2.4"
@@ -938,17 +940,17 @@
       }
     },
     "node_modules/@funnelsgrove/analytics": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.2.0.tgz",
-      "integrity": "sha512-7YFNAOPsw8BCL0RIqDmFM7JSI3ftYhP8BV+++/5u/ryNCdlZ46QpkQO94yXumUSoyKgRpg1zIgdeiaYJd0WWYA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.4.1.tgz",
+      "integrity": "sha512-9bj0d6fcmGoBlWmCGBqfi3o4jJFHT6TgufquyMPwpichVylhqzgGpSaJ8PPa6MCglHzyQbQfjvDAOhxrl4dZaw==",
       "peerDependencies": {
-        "@funnelsgrove/runtime": "^0.19.1"
+        "@funnelsgrove/runtime": "^0.21.1"
       }
     },
     "node_modules/@funnelsgrove/payments": {
-      "version": "0.22.1",
-      "resolved": "https://registry.npmjs.org/@funnelsgrove/payments/-/payments-0.22.1.tgz",
-      "integrity": "sha512-WIaOC833Ff5vYp+35ierfVCI9bxAQSXJ2vXVEHIV9RFMTmUD41jAfaE48lhZ/oW0h68Iod8rL9EfUyc0McWZQA==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/@funnelsgrove/payments/-/payments-0.23.2.tgz",
+      "integrity": "sha512-p+tjqo5Bl7g3bR02GOn5CCvFg/FGJwzZkbNUhHGLZjNQnSvBVQr8OluNEMCOvNmIC9B6OeutCZjcLvyoBnjltQ==",
       "dependencies": {
         "@solidgate/react-sdk": "1.34.0",
         "@stripe/react-stripe-js": "^5.6.0",
@@ -958,14 +960,14 @@
         "stripe": "^20.3.1"
       },
       "peerDependencies": {
-        "@funnelsgrove/analytics": "^0.1.111 || ^0.2.0",
-        "@funnelsgrove/runtime": "^0.19.1"
+        "@funnelsgrove/analytics": "^0.4.1",
+        "@funnelsgrove/runtime": "^0.21.1"
       }
     },
     "node_modules/@funnelsgrove/runtime": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.19.1.tgz",
-      "integrity": "sha512-4TTdhU4V2m2hViMd1mdo3vcRjaVvgORK5vcgu9UTGuAhjmUfMXjGTNkzHvgJ2LHLdr2NvFv+d+C0unj7fo5ouw==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.21.1.tgz",
+      "integrity": "sha512-RsPBT8rf0Ms7oU6dJehAY7cCYt7tCw1IjziiaVatguqt9Yusn3Mo2X7DyfIM1N0It6Klg/nlo1o7vwopRT28rg==",
       "dependencies": {
         "@funnelsgrove/sdk": "0.4.0",
         "posthog-js": "^1.369.2",
@@ -6177,6 +6179,53 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
+      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
+      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",

package/template_scaffold/package.json

@@ -12,9 +12,9 @@
     "validate:funnel": "vite-node --config src/contract/funnel-validator.vite.config.ts src/contract/validate-funnel.cli.ts"
   },
   "dependencies": {
-    "@funnelsgrove/analytics": "^0.2.0",
-    "@funnelsgrove/payments": "^0.22.1",
-    "@funnelsgrove/runtime": "^0.19.1",
+    "@funnelsgrove/analytics": "^0.4.1",
+    "@funnelsgrove/payments": "^0.23.2",
+    "@funnelsgrove/runtime": "^0.21.1",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",
     "lucide-react": "^0.553.0",
@@ -28,8 +28,10 @@
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",
+    "esbuild": "0.28.1",
     "eslint": "^9",
     "eslint-config-next": "16.1.6",
+    "playwright": "1.58.2",
     "typescript": "^5",
     "vite-node": "3.2.4",
     "vitest": "^3.2.4"

package/template_scaffold/src/components/FunnelFlow.tsx

@@ -11,6 +11,7 @@ import {
   usePreviewDefinitionOverrideRevision,
   usePreviewStepLocalizedContent,
 } from '@funnelsgrove/runtime';
+import { StripeFraudDetection } from './StripeFraudDetection';
 import { FunnelEditorPanel, FunnelEditorPanelStyles } from './FunnelEditorPanel';
 import { runtimeContent } from '@/steps/content/runtime.content';
 import { getStepContentLocale } from '@/runtime/step-content-context';
@@ -112,6 +113,7 @@ function FunnelFlowRuntime({
 
   return (
     <FunnelProvider value={controller.contextValue}>
+      <StripeFraudDetection featureFlags={controller.contextValue.featureFlags} />
       <section
         className="funnel-shell"
         suppressHydrationWarning

package/template_scaffold/src/components/StripeFraudDetection.tsx

@@ -0,0 +1,36 @@
+'use client';
+
+import { useEffect } from 'react';
+import {
+  resolvePublishedOfferSetSelection,
+  resolvePublishedRuntimeExperiments,
+  useBrowserLocationSearch,
+  useFunnelRuntimeConfig,
+  useRuntimeMode,
+} from '@funnelsgrove/runtime';
+
+/** Mount once in the funnel shell so lazy checkout screens still collect risk signals. */
+export function StripeFraudDetection({ featureFlags }: {
+  featureFlags: Readonly<Record<string, string>>;
+}) {
+  const { config } = useFunnelRuntimeConfig();
+  const [mode] = useRuntimeMode();
+  const search = useBrowserLocationSearch();
+  const { paymentProvidersByMode } = resolvePublishedOfferSetSelection({
+    offerSets: config?.offerSets ?? [],
+    pricingExperiments: resolvePublishedRuntimeExperiments(config).pricingExperiments,
+    featureFlags,
+    search,
+    defaultOfferSetId: config?.defaultOfferSetId ?? undefined,
+  });
+  const isStripe = paymentProvidersByMode[mode] === 'stripe';
+
+  useEffect(() => {
+    if (!isStripe) return;
+    // The official side-effect import loads Stripe.js with advanced signals enabled.
+    // Collection must never gate the quiz; checkout retains its own error handling.
+    void import('@stripe/stripe-js').catch(() => {});
+  }, [isStripe]);
+
+  return null;
+}

package/template_scaffold/src/config/billing.plans.ts

@@ -21,7 +21,7 @@ const starterLivePlans = {
     offerSetKey: STARTER_OFFER_SET_KEY,
     projectPlanId: '32b31f69-5907-4736-89c7-76d3acb38813',
     title: stepPaywallContent.locales.en.catalogLabels["1-Week Plan"],
-    providerPlanId: 'price_1T9WL2PPRN41Ty94g2NNOgif',
+    providerPlanId: 'price_REPLACE_WITH_YOUR_STRIPE_LIVE_WEEKLY',
     priceLabel: stepPaywallContent.locales.en.catalogLabels["$7.99/week"],
     perDayAmount: '$1.14',
     amountCents: 799,
@@ -32,7 +32,7 @@ const starterLivePlans = {
     offerSetKey: STARTER_OFFER_SET_KEY,
     projectPlanId: 'ce0a0022-7bf0-41f2-a707-edc5e6113a07',
     title: stepPaywallContent.locales.en.catalogLabels["1-Month Plan"],
-    providerPlanId: 'price_1TP0IIPPRN41Ty94npkzVeDR',
+    providerPlanId: 'price_REPLACE_WITH_YOUR_STRIPE_LIVE_MONTHLY',
     featuredTag: stepPaywallContent.locales.en.catalogLabels["🔥 Most Popular Choice"],
     priceLabel: stepPaywallContent.locales.en.catalogLabels["$29.99/month"],
     perDayAmount: '$1.00',
@@ -45,7 +45,7 @@ const starterLivePlans = {
     offerSetKey: STARTER_OFFER_SET_KEY,
     projectPlanId: 'fb623ebc-c2fd-4e6a-8eb6-b8ed92db1b21',
     title: stepPaywallContent.locales.en.catalogLabels["1-Year Plan"],
-    providerPlanId: 'price_1T06AEPPRN41Ty94zvVt5xrk',
+    providerPlanId: 'price_REPLACE_WITH_YOUR_STRIPE_LIVE_YEARLY',
     priceLabel: stepPaywallContent.locales.en.catalogLabels["$59.99/year"],
     perDayAmount: '$0.16',
     amountCents: 5999,
@@ -79,6 +79,7 @@ export const starterDefaultOfferSet = {
   id: STARTER_OFFER_SET_ID,
   key: STARTER_OFFER_SET_KEY,
   isActive: true,
+  locales: null,
   metadata: {
     discounts: starterDiscounts.map((discount, position) => ({
       key: discount.stage,
@@ -105,7 +106,9 @@ export const starterBillingRuntimeFallback = {
   sourceDeploymentId: 'starter-template',
   sourceVersionId: 'starter-template',
   publishedAt: '1970-01-01T00:00:00.000Z',
+  localeContractVersion: 1,
   sessionReplay: { enabled: false, sampleRate: 10 },
+  defaultOfferSetId: starterDefaultOfferSet.id,
   offerSets: [starterDefaultOfferSet],
   experiments: [],
 } satisfies ResolvedFunnelRuntimeConfig;

package/template_scaffold/src/config/billing.test.plans.ts

@@ -5,7 +5,7 @@ export const billingTestPlans = {
   primary: {
     projectPlanId: '32b31f69-5907-4736-89c7-76d3acb38813',
     title: stepPaywallContent.locales.en.catalogLabels["1-Week Plan"],
-    providerPlanId: 'price_1TOQ2fPEfkEVo5khumapOSsI',
+    providerPlanId: 'price_REPLACE_WITH_YOUR_STRIPE_TEST_WEEKLY',
     priceLabel: stepPaywallContent.locales.en.catalogLabels["$9.99/week"],
     perDayAmount: '$1.43',
     amountCents: 999,
@@ -14,7 +14,7 @@ export const billingTestPlans = {
   secondary: {
     projectPlanId: 'ce0a0022-7bf0-41f2-a707-edc5e6113a07',
     title: stepPaywallContent.locales.en.catalogLabels["1-Month Plan"],
-    providerPlanId: 'price_1TSgPZPEfkEVo5khMbtAlqsG',
+    providerPlanId: 'price_REPLACE_WITH_YOUR_STRIPE_TEST_MONTHLY',
     featuredTag: stepPaywallContent.locales.en.catalogLabels["🔥 Most Popular Choice"],
     priceLabel: stepPaywallContent.locales.en.catalogLabels["$29.99/month"],
     perDayAmount: '$1.00',
@@ -24,7 +24,7 @@ export const billingTestPlans = {
   tertiary: {
     projectPlanId: 'fb623ebc-c2fd-4e6a-8eb6-b8ed92db1b21',
     title: stepPaywallContent.locales.en.catalogLabels["1-Year Plan"],
-    providerPlanId: 'price_1TBgcaPEfkEVo5khbGnGhrBA',
+    providerPlanId: 'price_REPLACE_WITH_YOUR_STRIPE_TEST_YEARLY',
     priceLabel: stepPaywallContent.locales.en.catalogLabels["$59.99/year"],
     perDayAmount: '$0.16',
     amountCents: 5999,

package/template_scaffold/src/steps/content/step-32-paywall.content.ts

@@ -34,6 +34,7 @@ export type StepPaywallLocaleContent = {
     cardButtonLabel: string;
     metaLabels: readonly string[];
     stripeUnavailableNote: string;
+    plansUnavailableNote: string;
     perDayLabel: string;
   };
   checkout: {
@@ -157,6 +158,8 @@ export const stepPaywallContent = {
         metaLabels: ['Money-back guarantee', 'Cancel anytime'],
         stripeUnavailableNote:
           'Stripe publishable key is not available in this app runtime. Update the project payment environment variables or make sure your SDK publishable key maps to a funnel with Stripe settings.',
+        plansUnavailableNote:
+          'Plans are unavailable right now. Please try again in a moment or contact support.',
       },
       checkout: {
         title: 'Checkout',

package/template_scaffold/src/steps/editor/step-32-paywall.editor.ts

@@ -125,6 +125,12 @@ export const stepPaywallEditor: readonly StepEditorSection[] = [
         kind: 'textarea',
         path: 'plans.stripeUnavailableNote',
       },
+      {
+        id: 'plans.plansUnavailableNote',
+        label: 'Plans unavailable note',
+        kind: 'textarea',
+        path: 'plans.plansUnavailableNote',
+      },
     ],
   },
   {

package/template_scaffold/src/steps/step-32-paywall.tsx

@@ -14,6 +14,9 @@ import {
 import { stepPaywallContent } from '@/steps/content/step-32-paywall.content';
 import {
   PaymentRuntimeBoundary,
+  formatProviderMoney,
+  moneyToMajor,
+  type ProviderMoney,
   apiService,
   collectCurrentFunnelAttribution,
   readPaywallStateValue,
@@ -21,6 +24,7 @@ import {
   updatePaywallStateValue,
   useFunnel,
   useFunnelRuntimeConfig,
+  useBrowserOfferLocale,
   usePreviewStepLocalizedContent,
   useRuntimeMode,
   type FunnelStepMeta,
@@ -38,7 +42,9 @@ import {
   getDefaultPlanId,
   getPaywallPromoDisplayName,
   resolvePaywallDiscountState,
-  resolvePublishedBillingRuntime,
+  EMPTY_PUBLISHED_BILLING_RUNTIME,
+  resolvePublishedBillingRuntimeState,
+  usePinnedPublishedBillingRuntime,
   serializePaywallDiscountState,
   useStripeSubscriptionCheckoutSession,
   type PaywallDiscountState,
@@ -93,12 +99,7 @@ const deferPaywallStateSync = (syncState: () => void): (() => void) => {
   const timeoutId = window.setTimeout(syncState, 0);
   return () => window.clearTimeout(timeoutId);
 };
-const checkoutCurrencyFormatter = new Intl.NumberFormat('en-US', {
-  style: 'currency',
-  currency: 'USD',
-  minimumFractionDigits: 2,
-  maximumFractionDigits: 2,
-});
+
 const inactiveBillingDiscounts = buildBillingDiscountCatalog([
   {
     stage: 'first',
@@ -116,8 +117,8 @@ const inactiveBillingDiscounts = buildBillingDiscountCatalog([
   },
 ]);
 
-function formatCheckoutAmount(amountCents: number): string {
-  return checkoutCurrencyFormatter.format(amountCents / 100);
+function formatCheckoutAmount(amountMinor: number, money?: ProviderMoney): string {
+  return money ? formatProviderMoney({ ...money, amountMinor }, 'en-US') : '';
 }
 
 type StepPaywallProps = {
@@ -141,6 +142,7 @@ function StepPaywallRuntime({
   const checkoutMode = runtimeMode;
   const { user, setUser, attributes, featureFlags, completeStep, userBootstrapped } = useFunnel();
   const publishedRuntime = useFunnelRuntimeConfig();
+  const browserLocale = useBrowserOfferLocale();
   const content = usePreviewStepLocalizedContent(
     stepPaywallId,
     stepPaywallContent,
@@ -148,27 +150,33 @@ function StepPaywallRuntime({
   );
   const supportEmail = runtimePublicConfig.supportEmail;
   const paywallPreviewAsset = funnelManifest.assets.paywallPreview;
-  const activeBillingRuntime = useMemo(
-    () => resolvePublishedBillingRuntime({
-      config: publishedRuntime.config?.offerSets.length
-        ? publishedRuntime.config
-        : starterBillingRuntimeFallback,
-      featureFlags,
+  const billingResolution = useMemo(
+    () => resolvePublishedBillingRuntimeState({
+      config: publishedRuntime.config ?? (
+        publishedRuntime.status === 'fallback' && !publishedRuntime.error
+          ? starterBillingRuntimeFallback
+          : null
+      ),
+      featureFlags: publishedRuntime.featureFlags ?? featureFlags,
       mode: checkoutMode,
       search: typeof window === 'undefined' ? '' : window.location.search,
       baseCatalogsByMode: starterPlansByMode,
       fallbackDiscounts: billingDiscountList,
-    }),
-    [checkoutMode, featureFlags, publishedRuntime.config],
+      locale: browserLocale.status === 'resolved' ? browserLocale.locale : undefined,
+    }, browserLocale.status === 'resolved' && publishedRuntime.status !== 'loading'),
+    [browserLocale, checkoutMode, featureFlags, publishedRuntime.config, publishedRuntime.featureFlags, publishedRuntime.status, publishedRuntime.error],
   );
+  const billingSelection = usePinnedPublishedBillingRuntime(billingResolution);
+  const activeBillingRuntime = billingSelection.runtime ?? EMPTY_PUBLISHED_BILLING_RUNTIME;
+  const checkoutSelectionReady = billingSelection.resolution.status === 'resolved';
   const activeCheckoutRuntimeConfig = useMemo(() => ({
     ...checkoutRuntimeConfig,
-    funnelVersionId: publishedRuntime.config?.sourceVersionId ?? null,
+    funnelVersionId: activeBillingRuntime.sourceVersionId,
     paymentsApiVersion: activeBillingRuntime.paymentsApiVersion,
   }), [
     activeBillingRuntime.paymentsApiVersion,
     checkoutRuntimeConfig,
-    publishedRuntime.config?.sourceVersionId,
+    activeBillingRuntime.sourceVersionId,
   ]);
   const activeBillingDiscounts = useMemo(
     () => activeBillingRuntime.discounts ?? (
@@ -179,6 +187,28 @@ function StepPaywallRuntime({
     [activeBillingRuntime.discounts, activeBillingRuntime.provider],
   );
   const availablePlans = activeBillingRuntime.plans;
+  const unavailablePlanKeys = activeBillingRuntime.unavailablePlanKeys;
+  useEffect(() => {
+    if (unavailablePlanKeys.length === 0) {
+      return;
+    }
+
+    // Visitors only see the neutral note below; the author opening the funnel needs to know
+    // which published plans this payment mode cannot charge.
+    console.error('[funnelsgrove] published plans are unavailable in this payment mode', {
+      versionId: activeBillingRuntime.sourceVersionId,
+      revisionId: activeBillingRuntime.revisionId,
+      mode: activeBillingRuntime.mode,
+      offerSetId: activeBillingRuntime.offerSetId,
+      unavailablePlanKeys,
+    });
+  }, [
+    activeBillingRuntime.mode,
+    activeBillingRuntime.offerSetId,
+    activeBillingRuntime.revisionId,
+    activeBillingRuntime.sourceVersionId,
+    unavailablePlanKeys,
+  ]);
   const initialPlanId = useMemo(
     () =>
       availablePlans.find((plan) => plan.id === activeBillingRuntime.defaultPlanKey)?.id ??
@@ -227,8 +257,10 @@ function StepPaywallRuntime({
         plans: availablePlans,
         couponId: activeCouponId,
         discountPercent: discountState.discountPercent,
+        amountOffMinor: discountState.amountOffMinor,
+        discountCurrency: discountState.discountCurrency,
       }).map((plan) => localizePaywallPlanLabels(plan, content.catalogLabels)),
-    [activeCouponId, availablePlans, discountState.discountPercent, content.catalogLabels],
+    [activeCouponId, availablePlans, discountState.discountPercent, discountState.amountOffMinor, discountState.discountCurrency, content.catalogLabels],
   );
   const selectedPlan = useMemo(() => {
     if (availablePlans.length === 0) {
@@ -294,11 +326,12 @@ function StepPaywallRuntime({
 
     return Math.max(0, selectedDisplayPlan.baseAmountCents - selectedDisplayPlan.amountCents);
   }, [selectedDisplayPlan]);
-  const checkoutDiscountPercent = discountState.discountPercent ?? 0;
+  const checkoutDiscountPercent = discountState.amountOffMinor !== undefined && selectedDisplayPlan?.baseAmountCents
+    ? Number((appliedDiscountAmountCents / selectedDisplayPlan.baseAmountCents * 100).toFixed(2))
+    : discountState.discountPercent ?? 0;
   const checkoutPromoActive =
     Boolean(selectedDisplayPlan?.hasActiveDiscount) &&
     discountState.status === 'active' &&
-    checkoutDiscountPercent > 0 &&
     appliedDiscountAmountCents > 0;
   const checkoutAnalyticsMetadata = useMemo(() => {
     if (!selectedDisplayPlan) {
@@ -311,13 +344,18 @@ function StepPaywallRuntime({
       couponId: checkoutPromoActive ? selectedDisplayPlan.couponId : null,
       summaryLabel: checkoutSummaryLabel,
       amountCents: selectedDisplayPlan.amountCents,
-      currency: 'USD',
+      ...(selectedDisplayPlan.money ? { money: selectedDisplayPlan.money, currency: selectedDisplayPlan.money.currency, value: moneyToMajor(selectedDisplayPlan.money) } : {}),
       ...(typeof selectedDisplayPlan.analyticsPurchaseValue === 'number'
         ? { value: selectedDisplayPlan.analyticsPurchaseValue }
         : {}),
       environment: checkoutMode,
+      offerSetId: activeBillingRuntime.offerSetId,
+      runtimeConfigRevisionId: activeBillingRuntime.revisionId,
+      experimentId: activeBillingRuntime.experimentId,
+      variantKey: activeBillingRuntime.variantKey,
+      locale: activeBillingRuntime.locale,
     };
-  }, [checkoutMode, checkoutPromoActive, checkoutSummaryLabel, selectedDisplayPlan]);
+  }, [activeBillingRuntime, checkoutMode, checkoutPromoActive, checkoutSummaryLabel, selectedDisplayPlan]);
   const checkoutAnalyticsContext = useMemo(() => {
     if (!checkoutAnalyticsMetadata) {
       return null;
@@ -325,7 +363,7 @@ function StepPaywallRuntime({
 
     return {
       environment: checkoutMode,
-      featureFlags,
+      featureFlags: activeBillingRuntime.featureFlags,
       metadata: checkoutAnalyticsMetadata,
       runtimeConfig: activeCheckoutRuntimeConfig,
       stepId: analyticsStepId,
@@ -339,7 +377,7 @@ function StepPaywallRuntime({
     analyticsStepName,
     checkoutAnalyticsMetadata,
     checkoutMode,
-    featureFlags,
+    activeBillingRuntime.featureFlags,
   ]);
   const successReturnUrl = useMemo(() => {
     if (typeof window === 'undefined') {
@@ -383,7 +421,10 @@ function StepPaywallRuntime({
     couponId: checkoutPromoActive ? selectedDisplayPlan?.couponId ?? null : null,
     customerEmail: checkoutEmail || user.email,
     displayPlan: selectedDisplayPlan,
+    enabled: checkoutSelectionReady,
     onError: handleStripeCheckoutError,
+    onPreparationStart: billingSelection.pin,
+    onReset: billingSelection.reset,
     plan: checkoutProvider === 'stripe' ? selectedPlan : null,
     returnUrl: successReturnUrl,
     runtimeConfig: activeCheckoutRuntimeConfig,
@@ -404,11 +445,14 @@ function StepPaywallRuntime({
       customerEmail: checkoutEmail || user.email,
       customerName: user.name,
       displayPlan: selectedDisplayPlan,
+      enabled: checkoutSelectionReady,
       plan: selectedPlan,
       returnUrl: successReturnUrl,
       runtimeConfig: activeCheckoutRuntimeConfig,
       runtimeConfigRevisionId: activeBillingRuntime.revisionId,
       paymentProfileId: activeBillingRuntime.paymentProfileId,
+      onPreparationStart: billingSelection.pin,
+      onReset: billingSelection.reset,
       provider: checkoutProvider === 'stripe' ? 'stripe' : null,
       stripePublishableKey: activeBillingRuntime.stripePublishableKey,
       userId: user.id,
@@ -417,10 +461,13 @@ function StepPaywallRuntime({
       checkoutAnalyticsMetadata,
       checkoutEmail,
       checkoutMode,
+      checkoutSelectionReady,
       checkoutPromoActive,
       activeBillingRuntime.stripePublishableKey,
       activeBillingRuntime.paymentProfileId,
       activeBillingRuntime.revisionId,
+      billingSelection.pin,
+      billingSelection.reset,
       activeCheckoutRuntimeConfig,
       checkoutProvider,
       selectedDisplayPlan,
@@ -436,7 +483,7 @@ function StepPaywallRuntime({
     && activeBillingRuntime.offerSetId.trim()
     && selectedPlan?.funnelPlanKey?.trim(),
   );
-  const checkoutDisabled = !userBootstrapped || !selectedPlan || !selectedDisplayPlan || (
+  const checkoutDisabled = !checkoutSelectionReady || !userBootstrapped || !selectedPlan || !selectedDisplayPlan || (
     checkoutProvider === 'solidgate'
       ? !solidgateCheckoutConfigured
       : !checkoutSession.configured
@@ -462,12 +509,12 @@ function StepPaywallRuntime({
         String(checkoutDiscountPercent),
       )
     : '';
-  const checkoutDiscountAmountLabel = checkoutPromoActive
-    ? `-${formatCheckoutAmount(appliedDiscountAmountCents)}`
+  const checkoutDiscountAmountLabel = checkoutPromoActive && selectedDisplayPlan?.money
+    ? `-${formatCheckoutAmount(appliedDiscountAmountCents, selectedDisplayPlan?.money)}`
     : '';
-  const checkoutSavedLabel = checkoutPromoActive
+  const checkoutSavedLabel = checkoutPromoActive && selectedDisplayPlan?.money
     ? content.checkout.savedLabelTemplate
-        .replace('{amount}', formatCheckoutAmount(appliedDiscountAmountCents))
+        .replace('{amount}', formatCheckoutAmount(appliedDiscountAmountCents, selectedDisplayPlan?.money))
         .replace('{percent}', String(checkoutDiscountPercent))
     : '';
   useEffect(() => {
@@ -708,6 +755,8 @@ function StepPaywallRuntime({
   };
 
   const closeCheckoutDialog = () => {
+    if (checkoutProvider === 'stripe') checkoutSession.reset();
+    else billingSelection.reset();
     setCheckoutDialogOpen(false);
     setSolidgateAttemptKey(null);
     setError(null);
@@ -736,7 +785,10 @@ function StepPaywallRuntime({
     );
   };
 
-  if (!discountStateReady) {
+  if (billingSelection.resolution.status === 'error') {
+    return <div role='alert'>Payment options are temporarily unavailable.</div>;
+  }
+  if (!discountStateReady || billingSelection.resolution.status === 'pending') {
     return (
       <>
         <div className='paywall-v2-loading-screen' aria-live='polite'>
@@ -789,7 +841,7 @@ function StepPaywallRuntime({
         </div>
       ) : null}
 
-      {checkoutProvider === 'solidgate' &&
+      {checkoutSelectionReady && checkoutProvider === 'solidgate' &&
       checkoutDialogOpen &&
       solidgateAttemptKey &&
       selectedPlan?.funnelPlanKey ? (
@@ -846,6 +898,7 @@ function StepPaywallRuntime({
           onClose={closeCheckoutDialog}
           onCustomerEmailCommit={commitCheckoutEmail}
           onError={setError}
+          onPreparationStart={billingSelection.pin}
           onSuccess={handleCheckoutCompleted}
         />
       ) : null}
@@ -1001,7 +1054,7 @@ function StepPaywallRuntime({
                       </span>
                     ) : null}
                       <span className='paywall-v2-promo-upgrade-badge-main'>
-                        {content.checkout.discountLabelTemplate.replace('{percent}', String(discountState.discountPercent))}
+                        {content.checkout.discountLabelTemplate.replace('{percent}', String(checkoutDiscountPercent))}
                       </span>
                     </div>
                   <p className='paywall-v2-promo-upgrade-label'>{content.promo.upgradedLabel}</p>
@@ -1125,6 +1178,9 @@ function StepPaywallRuntime({
             {content.checkout.supportText}{' '}
             <a href={`mailto:${supportEmail}`}>{supportEmail}</a>
           </p>
+          {availablePlans.length === 0 ? (
+            <p className='paywall-v2-note' role='alert'>{content.plans.plansUnavailableNote}</p>
+          ) : null}
           {checkoutProvider === 'stripe' && !checkoutSession.configured ? (
             <p className='paywall-v2-note'>{content.plans.stripeUnavailableNote}</p>
           ) : null}