@funnelsgrove/cli 0.1.146 → 0.1.148

package/README.md

@@ -68,7 +68,7 @@ for the same local diff.
 
 Use `fgrove env pull` from a synced folder to refresh only the ignored local `.env` file after project settings change, without replacing source files. The generated file identifies the current hosted draft through `NEXT_PUBLIC_FUNNEL_VERSION_ID`, so transactional steps such as email capture work during local QA.
 
-`fgrove offer-sets sync` reports the applied offer set and written generated files before waiting for GitHub. By default it waits for the exact GitHub sync job. If that job is still pending or running when the wait times out, the command continues with a warning on stderr and asks you to check the eventual result with `fgrove github status`. Terminal job failures, missing jobs, and API failures still exit non-zero. Pass `--no-github-sync` to skip the wait entirely when the generated file will be committed through the normal repository workflow.
+Offer sets and payment mappings are runtime configuration. They are resolved remotely for preview and published funnels; `sync down` does not generate or download an offer-set source file.
 
 Create an experiment draft from a strict JSON spec:
 

package/dist/cli.d.ts

@@ -149,9 +149,8 @@ type SyncTargetIdInput = {
     active?: Pick<ActiveContext, 'workspaceId' | 'funnelId'> | null;
     defaultWorkspaceId?: string;
 };
-type GeneratedConfigKind = 'offerSets' | 'experiments';
-export declare const SYNC_DOWN_GENERATED_CONFIG_KINDS: GeneratedConfigKind[];
-export declare const EXPERIMENT_TRANSACTION_RECOVERY_COMMANDS: readonly ["sync down", "sync rebase", "sync up", "experiments sync", "offer-sets sync"];
+type GeneratedConfigKind = 'experiments';
+export declare const EXPERIMENT_TRANSACTION_RECOVERY_COMMANDS: readonly ["sync down", "sync rebase", "sync up", "experiments sync"];
 export declare function resolveSyncTargetIds(input: SyncTargetIdInput): {
     workspaceId: string;
     funnelId?: string;
@@ -182,16 +181,6 @@ export declare function formatSourceCandidateSyncSuccess(input: {
     deletedFileCount: number;
     versionId: string;
 }): string;
-export declare function buildSyncOfferSetPlansInput(input: {
-    workspaceId: string;
-    funnelId: string;
-    offerSet: string;
-}): {
-    workspaceId: string;
-    funnelId: string;
-    offerSetId?: string;
-    offerSetKey?: string;
-};
 export declare function buildGeneratedConfigSyncInput(input: {
     workspaceId: string;
     funnelId: string;
@@ -262,12 +251,10 @@ export declare const buildCloneFunnelMutationInput: (input: {
 };
 export type GitHubSyncTimeoutPolicy = 'strict' | 'continue';
 export declare const PUBLISH_GITHUB_SYNC_TIMEOUT_POLICY: GitHubSyncTimeoutPolicy;
-export declare const OFFER_SETS_GITHUB_SYNC_TIMEOUT_POLICY: GitHubSyncTimeoutPolicy;
 export declare const SYNC_UP_NO_LOCAL_CHANGES_GITHUB_SYNC_TIMEOUT_POLICY: GitHubSyncTimeoutPolicy;
 export declare const SYNC_UP_COMMITTED_CHANGES_GITHUB_SYNC_TIMEOUT_POLICY: GitHubSyncTimeoutPolicy;
 export declare const GITHUB_SYNC_TIMEOUT_POLICIES: {
     readonly publish: "continue";
-    readonly offerSetsSync: "continue";
     readonly syncUpNoLocalChanges: "strict";
     readonly syncUpCommittedChanges: "strict";
 };
@@ -282,10 +269,6 @@ export declare const syncGitHubDraftForCli: (input: {
 export declare const shouldSyncGitHubDraft: (options: {
     githubSync?: boolean;
 }) => boolean;
-export declare const formatOfferSetSyncSuccess: (input: {
-    offerSetLabel: string;
-    generatedFileCount: number;
-}) => string[];
 type ExperimentLifecycleAction = 'start' | 'stop' | 'restart' | 'end';
 type ExperimentLifecycleResult = {
     id: string;

package/dist/cli.js

@@ -11,7 +11,7 @@ import { CURRENT_STEP_CONTRACT_VERSION, FUNNEL_CONTRACT_DIAGNOSTIC_CODES, PREVIO
 import { abortFunnelSourceCandidate, applyFunnelDraftPatch, beginFunnelSourceCandidate, callTrpcProcedure, createFunnelExperimentFromSpec, finalizeFunnelDirectAssetUpload, finalizeFunnelSourceCandidate, prepareFunnelDirectAssetUpload, stageFunnelSourceCandidate, } from './apiClient.js';
 import { cliReleaseIdentity } from './cliIdentity.js';
 import { clearActiveContext, getDefaultAuthConfigPath, loadActiveContext, loadAuthToken, saveActiveContext, saveAuthToken, } from './authStore.js';
-import { buildCommittedSyncManifest, buildDownloadedSyncManifest, buildSourceCandidateOperations, collectChangedSourceFiles, collectSourceFiles, collectSourceSnapshot, ensureGitignore, formatSyncUploadSummary, hasLocalSourceChanges, rebaseSourceFiles, readSyncManifest, replaceSourceFiles, runSyncDownLocalLifecycle, runSourceCandidateSync, writeLocalEnvFile, writeSourceFiles, writeSourceRebaseBackup, writeSyncManifest, } from './localSync.js';
+import { buildCommittedSyncManifest, buildDownloadedSyncManifest, buildSourceCandidateOperations, collectChangedSourceFiles, collectSourceFiles, collectSourceSnapshot, ensureGitignore, filterSyncableSourceFiles, formatSyncUploadSummary, hasLocalSourceChanges, rebaseSourceFiles, readSyncManifest, replaceSourceFiles, runSyncDownLocalLifecycle, runSourceCandidateSync, writeLocalEnvFile, writeSourceFiles, writeSourceRebaseBackup, writeSyncManifest, } from './localSync.js';
 import { mergeTextSourceWithGit } from './sourceRebase.js';
 import { executeExperimentCreate, formatExperimentCreateSuccess, recoverExperimentCreateTransaction, } from './experimentCreate.js';
 import { pullEnvFile } from './envSync.js';
@@ -1069,16 +1069,13 @@ export async function executeCreateFunnel(input) {
     }
 }
 const GENERATED_CONFIG_PATH_BY_KIND = {
-    offerSets: 'src/config/offer-sets.generated.ts',
     experiments: 'src/config/experiments.generated.ts',
 };
-export const SYNC_DOWN_GENERATED_CONFIG_KINDS = ['offerSets'];
 export const EXPERIMENT_TRANSACTION_RECOVERY_COMMANDS = [
     'sync down',
     'sync rebase',
     'sync up',
     'experiments sync',
-    'offer-sets sync',
 ];
 const experimentTransactionRecoveryCommands = new Set(EXPERIMENT_TRANSACTION_RECOVERY_COMMANDS);
 export function resolveSyncTargetIds(input) {
@@ -1133,17 +1130,6 @@ export function formatSourceCandidateSyncSuccess(input) {
         : '';
     return `Synced ${synced}${deleted} to draft version ${input.versionId}`;
 }
-export function buildSyncOfferSetPlansInput(input) {
-    const offerSet = input.offerSet.trim();
-    if (!offerSet) {
-        throw new Error('--offer-set is required');
-    }
-    return {
-        workspaceId: input.workspaceId,
-        funnelId: input.funnelId,
-        ...(UUID_PATTERN.test(offerSet) ? { offerSetId: offerSet } : { offerSetKey: offerSet }),
-    };
-}
 export function buildGeneratedConfigSyncInput(input) {
     return {
         workspaceId: input.workspaceId,
@@ -1573,12 +1559,10 @@ const summarizeGitHubSyncResult = (result) => {
         : `GitHub already synced${remoteSha}`;
 };
 export const PUBLISH_GITHUB_SYNC_TIMEOUT_POLICY = 'continue';
-export const OFFER_SETS_GITHUB_SYNC_TIMEOUT_POLICY = 'continue';
 export const SYNC_UP_NO_LOCAL_CHANGES_GITHUB_SYNC_TIMEOUT_POLICY = 'strict';
 export const SYNC_UP_COMMITTED_CHANGES_GITHUB_SYNC_TIMEOUT_POLICY = 'strict';
 export const GITHUB_SYNC_TIMEOUT_POLICIES = {
     publish: PUBLISH_GITHUB_SYNC_TIMEOUT_POLICY,
-    offerSetsSync: OFFER_SETS_GITHUB_SYNC_TIMEOUT_POLICY,
     syncUpNoLocalChanges: SYNC_UP_NO_LOCAL_CHANGES_GITHUB_SYNC_TIMEOUT_POLICY,
     syncUpCommittedChanges: SYNC_UP_COMMITTED_CHANGES_GITHUB_SYNC_TIMEOUT_POLICY,
 };
@@ -1606,10 +1590,6 @@ export const syncGitHubDraftForCli = async (input) => {
 };
 const formatGeneratedFileCount = (count) => `${count} generated config ${count === 1 ? 'file' : 'files'}`;
 export const shouldSyncGitHubDraft = (options) => options.githubSync !== false;
-export const formatOfferSetSyncSuccess = (input) => [
-    `Synced offer set ${input.offerSetLabel} to funnel draft`,
-    `Wrote ${formatGeneratedFileCount(input.generatedFileCount)}`,
-];
 export const formatExperimentLifecycleSuccess = (action, result, json) => {
     const payload = {
         experimentId: result.id,
@@ -2100,58 +2080,6 @@ addExamples(funnelsCommand
     });
     console.log(`${result.funnel.id}\t${result.funnel.name}\t${result.funnel.slug}`);
 });
-const offerSetsCommand = addExamples(program.command('offer-sets').alias('offers').description('Manage project offer sets'), [
-    'fgrove offer-sets sync --offer-set default-paywall',
-    'fgrove offers sync --funnel claimbee-ios --offer-set three-month-test',
-]);
-addExamples(offerSetsCommand
-    .command('sync')
-    .description('Apply an offer set to a funnel draft billing snapshot')
-    .option('--workspace <id-or-slug-or-name>', 'Workspace id, slug, or name')
-    .option('--funnel <id-or-slug>', 'Funnel id or slug')
-    .option('--dir <path>', 'Local source directory for reading sync manifest', '.')
-    .option('--no-github-sync', 'Skip waiting for an additional GitHub draft push')
-    .requiredOption('--offer-set <key-or-id>', 'Offer set key or id'), [
-    'fgrove offer-sets sync --offer-set default-paywall',
-    'fgrove offers sync --funnel claimbee-ios --offer-set quarterly-test',
-])
-    .action(async (options) => {
-    const token = await readAuthToken();
-    const target = await resolveSyncTarget({
-        token,
-        workspace: options.workspace,
-        funnel: options.funnel,
-        dir: options.dir,
-    });
-    const result = await callApi({
-        path: 'funnels.syncOfferSetPlans',
-        type: 'mutation',
-        token,
-        data: buildSyncOfferSetPlansInput({
-            workspaceId: target.workspaceId,
-            funnelId: target.funnelId,
-            offerSet: options.offerSet,
-        }),
-    });
-    const generatedFiles = await syncGeneratedConfigFilesForCli({
-        token,
-        target,
-        kinds: ['offerSets'],
-    });
-    const offerSetLabel = result.offerSet?.key || result.offerSet?.display_name || options.offerSet.trim();
-    console.log(formatOfferSetSyncSuccess({
-        offerSetLabel,
-        generatedFileCount: generatedFiles.length,
-    }).join('\n'));
-    if (shouldSyncGitHubDraft(options)) {
-        await syncGitHubDraftForCli({
-            token,
-            workspaceId: target.workspaceId,
-            funnelId: target.funnelId,
-            timeoutPolicy: OFFER_SETS_GITHUB_SYNC_TIMEOUT_POLICY,
-        });
-    }
-});
 const experimentsCommand = addExamples(program.command('experiments').description('Manage funnel experiments'), [
     'fgrove experiments create --spec experiment.json --dir .',
     'fgrove experiments sync',
@@ -2541,11 +2469,12 @@ addExamples(syncCommand
             funnelId: target.funnelId,
         },
     });
+    const sourceFiles = filterSyncableSourceFiles(result.files);
     const downloadedSyncManifest = buildDownloadedSyncManifest({
         workspaceId: target.workspaceId,
         funnelId: target.funnelId,
         draftVersionId: result.draftVersionId,
-        files: result.files,
+        files: sourceFiles,
     });
     if (options.force && target.manifest && hasLocalChanges) {
         const localFiles = await collectSourceFiles(target.sourceDir);
@@ -2558,12 +2487,7 @@ addExamples(syncCommand
         console.log(`Saved the pre-force source backup to ${path.join(target.sourceDir, backupPath)}`);
     }
     await mkdir(target.sourceDir, { recursive: true });
-    await writeSourceFiles(target.sourceDir, result.files);
-    const generatedFiles = await syncGeneratedConfigFilesForCli({
-        token,
-        target,
-        kinds: SYNC_DOWN_GENERATED_CONFIG_KINDS,
-    });
+    await writeSourceFiles(target.sourceDir, sourceFiles);
     await writeLocalEnvFile(target.sourceDir, result.envFile);
     await ensureGitignore(target.sourceDir);
     await runSyncDownLocalLifecycle({
@@ -2582,8 +2506,7 @@ addExamples(syncCommand
         },
         writeSyncState: async () => writeSyncManifest(target.sourceDir, downloadedSyncManifest),
     });
-    console.log(`Synced ${result.files.length} files to ${target.sourceDir}`);
-    console.log(`Wrote ${formatGeneratedFileCount(generatedFiles.length)}`);
+    console.log(`Synced ${sourceFiles.length} files to ${target.sourceDir}`);
 });
 addExamples(syncCommand
     .command('rebase')
@@ -2631,12 +2554,14 @@ addExamples(syncCommand
     if (base.draftVersionId !== target.manifest.draftVersionId) {
         throw Object.assign(new Error('The hosted historical export returned the wrong sync baseline. The rebase was not applied.'), { code: 'FG-SYNC-REBASE-BASE' });
     }
-    assertHistoricalSyncBaseline({ manifest: target.manifest, files: base.files });
+    const remoteFiles = filterSyncableSourceFiles(remote.files);
+    const baseFiles = filterSyncableSourceFiles(base.files);
+    assertHistoricalSyncBaseline({ manifest: target.manifest, files: baseFiles });
     const localFiles = await collectSourceFiles(target.sourceDir);
     const merged = await rebaseSourceFiles({
-        baseFiles: base.files,
+        baseFiles,
         localFiles,
-        remoteFiles: remote.files,
+        remoteFiles,
         remoteOwnedPaths: await loadManagedSyncPaths(),
         mergeText: mergeTextSourceWithGit,
     });
@@ -2659,18 +2584,13 @@ addExamples(syncCommand
         workspaceId: target.workspaceId,
         funnelId: target.funnelId,
         draftVersionId: remote.draftVersionId,
-        files: remote.files,
+        files: remoteFiles,
     });
     await replaceSourceFiles({
         rootDir: target.sourceDir,
         currentFiles: localFiles,
         nextFiles: merged.files,
     });
-    const generatedFiles = await syncGeneratedConfigFilesForCli({
-        token,
-        target,
-        kinds: SYNC_DOWN_GENERATED_CONFIG_KINDS,
-    });
     await writeLocalEnvFile(target.sourceDir, remote.envFile);
     await ensureGitignore(target.sourceDir);
     await runSyncDownLocalLifecycle({
@@ -2691,7 +2611,6 @@ addExamples(syncCommand
     });
     const localChanges = await collectChangedSourceFiles(target.sourceDir, downloadedSyncManifest);
     console.log(`Rebased ${localChanges.files.length + localChanges.deletedPaths.length} local changes onto hosted draft ${remote.draftVersionId}.`);
-    console.log(`Wrote ${formatGeneratedFileCount(generatedFiles.length)}`);
     console.log('Run `fgrove validate`, review the diff, then run `fgrove sync up`.');
 });
 const envCommand = addExamples(program.command('env').description('Manage local funnel environment files'), [

package/dist/localSync.d.ts

@@ -1,4 +1,5 @@
 export declare const SYNC_MANIFEST_FILE = ".funnelsgrove-sync.json";
+export declare const LEGACY_OFFER_SETS_GENERATED_PATH = "src/config/offer-sets.generated.ts";
 export type SyncManifestFile = {
     path: string;
     hash: string;
@@ -109,6 +110,7 @@ export declare const writeSafeRootFile: (rootDir: string, relativePath: string,
 export declare function normalizeSyncPath(filePath: string): string;
 export declare function assertSafeSyncPath(filePath: string): string;
 export declare function shouldSyncFile(filePath: string): boolean;
+export declare function filterSyncableSourceFiles(files: readonly SourceFile[]): SourceFile[];
 export declare function buildSyncManifest(rootDir: string, input: SyncManifestInput): Promise<SyncManifest>;
 export declare function buildCommittedSyncManifest(input: {
     workspaceId: string;

package/dist/localSync.js

@@ -3,6 +3,7 @@ import { constants } from 'node:fs';
 import { lstat, mkdir, open, readdir, realpath, rename, rm, stat } from 'node:fs/promises';
 import path from 'node:path';
 export const SYNC_MANIFEST_FILE = '.funnelsgrove-sync.json';
+export const LEGACY_OFFER_SETS_GENERATED_PATH = 'src/config/offer-sets.generated.ts';
 export const DEFAULT_PATCH_BATCH_CONTENT_CHARS = 12_000_000;
 export const DEFAULT_SOURCE_CANDIDATE_BATCH_CONTENT_BYTES = 12_000_000;
 export const MAX_SOURCE_CANDIDATE_OPERATIONS = 200 * 500;
@@ -264,11 +265,17 @@ export function shouldSyncFile(filePath) {
     if (fileName === SYNC_MANIFEST_FILE) {
         return false;
     }
+    if (normalized === LEGACY_OFFER_SETS_GENERATED_PATH) {
+        return false;
+    }
     if (fileName === '.env' || (fileName.startsWith('.env.') && fileName !== '.env.example')) {
         return false;
     }
     return true;
 }
+export function filterSyncableSourceFiles(files) {
+    return files.filter((file) => shouldSyncFile(file.path));
+}
 export async function buildSyncManifest(rootDir, input) {
     const resolvedRoot = await resolveSafeRoot(rootDir, false);
     const files = await collectSyncFiles(resolvedRoot, resolvedRoot);

package/funnel-contract-compatibility.json

@@ -4,10 +4,10 @@
   "minimumCliVersion": "0.1.20",
   "entries": [
     {
-      "repositoryCliVersion": "0.1.146",
+      "repositoryCliVersion": "0.1.148",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.136",
+        "bundleVersion": "2.0.138",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -45,7 +45,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "f0960bc044d9c4e5a550e5bc968fefd0840c03829ecb94348736798fc8fa9d1b"
+            "sha256": "ccbc9d8fdcd40ff40b3aed6171f0496d856f8dfc6bd9c6cb96ee5bfeddaaaa01"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -145,16 +145,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "57bb326172c83897a6656615a8ddc1b19bc9eeee808cd07f33ec2fb708102942"
+            "sha256": "09e75871d05290fe9e44817ab35504638d180217242522893ad68cd516deae0f"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.145",
+      "repositoryCliVersion": "0.1.147",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.135",
+        "bundleVersion": "2.0.137",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -192,7 +192,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "0b3708beaa8d63e1c1fe5ab38e39fdf7a3e12fec39166261a1bad7619d872179"
+            "sha256": "d540fec73ced6fdcc2d118aac9a2f1f1131dfbd7d4fa6df80d988733725ffcbb"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -292,16 +292,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "7fa793bde89dc1106b24eb408f225d156865bffe37f4feb7aeadb553844643c8"
+            "sha256": "66145b48217b80e9e5eb0b21d2d4d8de7186ed980a54b01b56b2a23202822503"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.144",
+      "repositoryCliVersion": "0.1.146",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.134",
+        "bundleVersion": "2.0.136",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -339,7 +339,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "fec5ced4b8e8e6c8081f5446b3b4174caefa89ac6d441f03e576fb10e961bc98"
+            "sha256": "f0960bc044d9c4e5a550e5bc968fefd0840c03829ecb94348736798fc8fa9d1b"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -355,7 +355,7 @@
           },
           {
             "path": "docs/funnelsgrove/qa/publish.md",
-            "sha256": "82b05b8c6eebf25d32d2cff6f05b08bc39661dcbb46caa6b912de6b803aed39c"
+            "sha256": "67391a8bf5e1ddeab2e7430f48a589c28ce5fb986f06fee74f78f09649086603"
           },
           {
             "path": "docs/funnelsgrove/recipes/add-experiment.md",
@@ -439,16 +439,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "efdede3e20f75d3b6f5dc00daa3e8ee1c3c03d56978fa087161b643424add0cc"
+            "sha256": "57bb326172c83897a6656615a8ddc1b19bc9eeee808cd07f33ec2fb708102942"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.143",
+      "repositoryCliVersion": "0.1.145",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.133",
+        "bundleVersion": "2.0.135",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -486,7 +486,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
+            "sha256": "0b3708beaa8d63e1c1fe5ab38e39fdf7a3e12fec39166261a1bad7619d872179"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -502,7 +502,7 @@
           },
           {
             "path": "docs/funnelsgrove/qa/publish.md",
-            "sha256": "82b05b8c6eebf25d32d2cff6f05b08bc39661dcbb46caa6b912de6b803aed39c"
+            "sha256": "67391a8bf5e1ddeab2e7430f48a589c28ce5fb986f06fee74f78f09649086603"
           },
           {
             "path": "docs/funnelsgrove/recipes/add-experiment.md",
@@ -586,22 +586,22 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
+            "sha256": "7fa793bde89dc1106b24eb408f225d156865bffe37f4feb7aeadb553844643c8"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.142",
+      "repositoryCliVersion": "0.1.144",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.132",
+        "bundleVersion": "2.0.134",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
           {
             "path": "AGENTS.md",
-            "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+            "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
           },
           {
             "path": "CLAUDE.md",
@@ -633,7 +633,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "33d225bcc4f6f7aaa473f3bebe81799b3ec4751c374a4c2d9159afc56415ba74"
+            "sha256": "fec5ced4b8e8e6c8081f5446b3b4174caefa89ac6d441f03e576fb10e961bc98"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -733,22 +733,22 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "ea5b05c7f28303245e358598f125a3a31c15175c2ef15ae8873b25be2ded133e"
+            "sha256": "efdede3e20f75d3b6f5dc00daa3e8ee1c3c03d56978fa087161b643424add0cc"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.141",
+      "repositoryCliVersion": "0.1.143",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.131",
+        "bundleVersion": "2.0.133",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
           {
             "path": "AGENTS.md",
-            "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+            "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
           },
           {
             "path": "CLAUDE.md",
@@ -780,7 +780,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "015d013594cabb94c288bb39d7c717f531b68a1fe4754e6baefc0e08bbc5b872"
+            "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -880,16 +880,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "7af952690a2b3c592ce6688b8524aa4c5fe111a0c798dc25106eb0d594c2452b"
+            "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.140",
+      "repositoryCliVersion": "0.1.142",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.130",
+        "bundleVersion": "2.0.132",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -927,7 +927,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "9988e6f7b4ecf3f4a73ff83cf3f3613f82d765c59d09e55e86b0560d1e3eafa5"
+            "sha256": "33d225bcc4f6f7aaa473f3bebe81799b3ec4751c374a4c2d9159afc56415ba74"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -1027,7 +1027,7 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "4e81bd56071fa38708c7f18488420038339c8cc984062ffd7e8a4930ab6b06f0"
+            "sha256": "ea5b05c7f28303245e358598f125a3a31c15175c2ef15ae8873b25be2ded133e"
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/cli",
-  "version": "0.1.146",
+  "version": "0.1.148",
   "description": "FunnelsGrove command-line tools for editing, syncing, and publishing funnels",
   "repository": {
     "type": "git",

package/template_docs/.funnelsgrove-docs.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.136",
+  "bundleVersion": "2.0.138",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "f0960bc044d9c4e5a550e5bc968fefd0840c03829ecb94348736798fc8fa9d1b"
+      "sha256": "ccbc9d8fdcd40ff40b3aed6171f0496d856f8dfc6bd9c6cb96ee5bfeddaaaa01"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "57bb326172c83897a6656615a8ddc1b19bc9eeee808cd07f33ec2fb708102942"
+      "sha256": "09e75871d05290fe9e44817ab35504638d180217242522893ad68cd516deae0f"
     }
   ]
 }

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/runtime` `0.7.28` first, then `@funnelsgrove/analytics` `0.1.77`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.146`, 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/runtime` `0.7.28` first, then `@funnelsgrove/analytics` `0.1.77`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.148`, 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.136",
+  "bundleVersion": "2.0.138",
   "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.136",
+  "bundleVersion": "2.0.138",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "f0960bc044d9c4e5a550e5bc968fefd0840c03829ecb94348736798fc8fa9d1b"
+      "sha256": "ccbc9d8fdcd40ff40b3aed6171f0496d856f8dfc6bd9c6cb96ee5bfeddaaaa01"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "57bb326172c83897a6656615a8ddc1b19bc9eeee808cd07f33ec2fb708102942"
+      "sha256": "09e75871d05290fe9e44817ab35504638d180217242522893ad68cd516deae0f"
     }
   ]
 }

package/template_scaffold/.funnelsgrove-scaffold.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 1,
-  "sourceTreeHash": "5f7015815cec65266d11c6c96aae425d72b251107d1ae4541a6405bcd696bf6b",
+  "sourceTreeHash": "05c15c49bd14c9a2d805262acf88621c42e5f6b83e79418248b1efcbe7ac900e",
   "stepContractVersion": 3,
-  "docsBundleVersion": "2.0.136",
+  "docsBundleVersion": "2.0.138",
   "files": [
     {
       "path": ".env.example",
@@ -16,7 +16,7 @@
     },
     {
       "path": ".funnelsgrove-docs.json",
-      "sha256": "3e7fe2377e1251fbfbf00bd8e9fe37b2148e8b43f1b5fa72f3109ae3829cdc9f",
+      "sha256": "9e404c0cb39e2e401121d9f381aafde42479ed11ce766ee91e3d4937438d55ad",
       "mode": "100644"
     },
     {
@@ -101,7 +101,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "f0960bc044d9c4e5a550e5bc968fefd0840c03829ecb94348736798fc8fa9d1b",
+      "sha256": "ccbc9d8fdcd40ff40b3aed6171f0496d856f8dfc6bd9c6cb96ee5bfeddaaaa01",
       "mode": "100644"
     },
     {
@@ -236,7 +236,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "57bb326172c83897a6656615a8ddc1b19bc9eeee808cd07f33ec2fb708102942",
+      "sha256": "09e75871d05290fe9e44817ab35504638d180217242522893ad68cd516deae0f",
       "mode": "100644"
     },
     {
@@ -551,7 +551,7 @@
     },
     {
       "path": "src/steps/step-32-paywall.tsx",
-      "sha256": "513af16a9ad06858461976c83ec10910f8ede0466cfc847e6b8982e56fca0caa",
+      "sha256": "0d1439a122117ad07b460be3d17490bcd3323d88ea3513b1c182846e4d468ce2",
       "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/runtime` `0.7.28` first, then `@funnelsgrove/analytics` `0.1.77`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.146`, 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/runtime` `0.7.28` first, then `@funnelsgrove/analytics` `0.1.77`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.148`, 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.136",
+  "bundleVersion": "2.0.138",
   "contractSource": "funnelsgrove-repository://apps/funnel-runtime/contracts/step-contract-v2.json",
   "fullyGenerated": [
     ".funnelsgrove-docs.json",

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

@@ -362,6 +362,9 @@ function StepPaywallRuntime({
     runtimeConfig: checkoutRuntimeConfig,
     userId: user.id,
   });
+  const checkoutCardClientSecret = checkoutSession.activeClientSecret;
+  const checkoutCardLoading = checkoutSession.loading.card;
+  const prepareCardCheckout = checkoutSession.prepareCardCheckout;
   const walletCheckoutInput = useMemo<StripeSubscriptionWalletSurfaceCheckoutInput>(
     () => ({
       analyticsMetadata: checkoutAnalyticsMetadata,
@@ -454,6 +457,27 @@ function StepPaywallRuntime({
     setError(null);
   }, [selectedPlanId]);
 
+  useEffect(() => {
+    if (
+      !discountStateReady ||
+      checkoutProvider !== 'stripe' ||
+      checkoutDisabled ||
+      checkoutCardClientSecret ||
+      checkoutCardLoading
+    ) {
+      return;
+    }
+
+    void prepareCardCheckout({ checkoutStartSource: 'checkout_render' });
+  }, [
+    checkoutDisabled,
+    checkoutProvider,
+    checkoutCardClientSecret,
+    checkoutCardLoading,
+    discountStateReady,
+    prepareCardCheckout,
+  ]);
+
   useEffect(() => {
     if (!discountStateReady) {
       return;
@@ -520,7 +544,7 @@ function StepPaywallRuntime({
     paywallWalletMethodWrapperClassNames[method];
 
   const startCheckout = async () => {
-    if (checkoutDisabled || (checkoutProvider === 'stripe' && checkoutSession.loading.card)) {
+    if (checkoutDisabled) {
       return;
     }
 
@@ -561,7 +585,7 @@ function StepPaywallRuntime({
   };
 
   const openCardCheckoutFromUnavailableWallet = async () => {
-    if (checkoutDisabled || checkoutSession.loading.card) {
+    if (checkoutDisabled) {
       return;
     }
 
@@ -645,24 +669,6 @@ function StepPaywallRuntime({
     );
   }
 
-  if (checkoutProvider === 'stripe' && checkoutSession.loading.card) {
-    return (
-      <>
-        <div
-          className='paywall-v2-loading-screen'
-          aria-label='Loading checkout'
-          aria-live='polite'
-        >
-          <div className='paywall-v2-loading-content'>
-            <div className='paywall-v2-loading-spinner' aria-hidden='true' />
-          </div>
-        </div>
-
-        <style>{stepPaywallStyles}</style>
-      </>
-    );
-  }
-
   return (
     <>
       {checkoutProvider === 'solidgate' &&
@@ -987,10 +993,7 @@ function StepPaywallRuntime({
             type='button'
             className='paywall-v2-card-button paywall-v2-vibe-cta'
             onClick={() => void startCheckout()}
-            disabled={
-              checkoutDisabled ||
-              (checkoutProvider === 'stripe' && checkoutSession.loading.card)
-            }
+            disabled={checkoutDisabled}
           >
             {content.plans.cardButtonLabel}
           </button>