@funnelsgrove/cli 0.1.143 → 0.1.147

package/README.md

@@ -7,6 +7,17 @@ npm install -g @funnelsgrove/cli
 fgrove login
 ```
 
+Update every global installation visible on `PATH` (including separate NVM and
+Homebrew prefixes) with one command:
+
+```bash
+fgrove update
+```
+
+Use `fgrove update --dry-run` to inspect the installations first. The updater
+runs each installation's sibling `npm`, so duplicate global installs cannot
+silently remain on different CLI versions.
+
 Sync a funnel into its own local folder:
 
 ```bash
@@ -29,6 +40,10 @@ fgrove publish --env preview
 
 Inside a synced folder, `fgrove` reads `.funnelsgrove-sync.json` first, so you do not need to run `fgrove use` when switching between local funnel directories. Use `fgrove use` only when you want a global fallback context for commands outside a synced folder.
 
+`fgrove funnels clone` copies the draft and the funnel's offer-set mapping. The
+clone reuses the same project-level offer sets and payment profiles; custom-domain
+configuration is not copied into the new preview.
+
 `fgrove sync down` refuses to overwrite local changes in an existing synced
 folder. `fgrove sync up` sends only changed and deleted paths in one atomic
 draft patch. Disjoint concurrent edits are rebased automatically; if the same
@@ -87,6 +102,8 @@ fgrove publish --funnel claimbee-general --env preview
 The GitHub commands use the FunnelsGrove API only. `fgrove github pull` pulls
 the repository into the hosted draft after you push normal git commits.
 `fgrove publish` waits for the current draft to reach GitHub before publishing.
+It writes validation, GitHub sync, queue, build, image optimization, and upload
+progress to stderr while keeping the final URL/version row alone on stdout.
 If the exact job is still pending or running when that wait times out, publish
 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

package/dist/cli.d.ts

@@ -239,6 +239,8 @@ type PublishCommandBackend = {
         funnelId: string;
     }) => Promise<FunnelDetailResponse>;
 };
+export type PublishProgressReporter = (message: string) => void;
+export declare const formatPublishProgress: (deployment: PublishDeploymentStatus) => string;
 export declare const executePublishAndWait: (input: {
     token: string;
     workspaceId: string;
@@ -246,6 +248,7 @@ export declare const executePublishAndWait: (input: {
     message?: string;
     domains?: string[];
     backend?: PublishCommandBackend;
+    onProgress?: PublishProgressReporter;
 }) => Promise<string>;
 export declare const buildCloneFunnelMutationInput: (input: {
     workspaceId: string;

package/dist/cli.js

@@ -16,6 +16,7 @@ import { mergeTextSourceWithGit } from './sourceRebase.js';
 import { executeExperimentCreate, formatExperimentCreateSuccess, recoverExperimentCreateTransaction, } from './experimentCreate.js';
 import { pullEnvFile } from './envSync.js';
 import { executeFastDraftPatchSync, uploadDirectAssetWithFetch } from './draftPatchSync.js';
+import { updateCliInstallations } from './selfUpdate.js';
 import { executeExpensePublish, executeExpensePull } from './expenseCommands.js';
 import { executeEmailPull, executeEmailPush, executeEmailSend, executeEmailUpdateVariables, executeEmailSequenceAddStep, executeEmailSequenceCancel, executeEmailSequenceCreate, executeEmailSequencePublish, executeEmailSequenceSetActive, executeEmailTemplatePublish, executeEmailValidate, parseEmailVariablesJson, } from './emailCommands.js';
 import { formatGitHubConnectRows, formatGitHubJobRows, formatGitHubStatusRows, } from './githubOutput.js';
@@ -1201,6 +1202,39 @@ export const formatPublishTerminalSuccess = (input) => {
         || input.acknowledgement.deploymentUrl;
     return `${deploymentUrl}\tv${publishedVersionSeq}\t${versionId}`;
 };
+const PUBLISH_BUILD_STAGE_LABELS = {
+    sandboxCreate: 'starting build environment',
+    writeFiles: 'writing source files',
+    install: 'installing dependencies',
+    nextBuild: 'building funnel',
+    readExport: 'reading build output',
+    imageVariants: 'optimizing images',
+    r2Upload: 'uploading publish artifact',
+};
+export const formatPublishProgress = (deployment) => {
+    const state = deployment.state.trim().toLowerCase();
+    const metadata = isRecord(deployment.metadata) ? deployment.metadata : {};
+    const publishBuild = isRecord(metadata.publishBuild) ? metadata.publishBuild : null;
+    const stageName = publishBuild ? nonEmptyString(publishBuild.stageName) : null;
+    const stageStatus = publishBuild ? nonEmptyString(publishBuild.status) : null;
+    if (stageName) {
+        const label = PUBLISH_BUILD_STAGE_LABELS[stageName] || stageName;
+        if (stageStatus === 'completed')
+            return `Publish: ${label} completed.`;
+        if (stageStatus === 'failed')
+            return `Publish: ${label} failed.`;
+        return `Publish: ${label}...`;
+    }
+    if (state === 'queued')
+        return 'Publish: queued...';
+    if (state === 'building')
+        return 'Publish: preparing build...';
+    if (state === 'syncing')
+        return 'Publish: uploading publish artifact...';
+    if (state === 'ready')
+        return 'Publish: ready.';
+    return `Publish: ${state}...`;
+};
 const getApiUrl = () => {
     const options = program.opts();
     return options.apiUrl || process.env.FUNNELSGROVE_API_URL || DEFAULT_API_URL;
@@ -1235,6 +1269,7 @@ const isTerminalDeploymentState = (state) => {
 };
 const waitForPublishDeployment = async (input) => {
     const deadline = Date.now() + PUBLISH_WAIT_TIMEOUT_MS;
+    let lastProgressMessage = null;
     while (Date.now() <= deadline) {
         const detail = input.detail
             ? await input.detail(input)
@@ -1248,6 +1283,13 @@ const waitForPublishDeployment = async (input) => {
                 },
             });
         const deployment = detail.deployments.find((item) => item.id === input.deploymentId);
+        if (deployment && input.onProgress) {
+            const progressMessage = formatPublishProgress(deployment);
+            if (progressMessage !== lastProgressMessage) {
+                input.onProgress(progressMessage);
+                lastProgressMessage = progressMessage;
+            }
+        }
         if (deployment && isTerminalDeploymentState(deployment.state)) {
             if (deployment.state === 'failed') {
                 throw new Error(formatPublishTerminalFailure(deployment));
@@ -1284,6 +1326,7 @@ export const executePublishAndWait = async (input) => {
             },
         }),
     };
+    input.onProgress?.('Publish: requesting deployment...');
     const acknowledgement = await backend.publish({
         token: input.token,
         workspaceId: input.workspaceId,
@@ -1291,12 +1334,14 @@ export const executePublishAndWait = async (input) => {
         message: input.message,
         domains: input.domains,
     });
+    input.onProgress?.(`Publish: deployment ${acknowledgement.deploymentId} accepted.`);
     const deployment = await waitForPublishDeployment({
         token: input.token,
         workspaceId: input.workspaceId,
         funnelId: input.funnelId,
         deploymentId: acknowledgement.deploymentId,
         detail: backend.detail,
+        onProgress: input.onProgress,
     });
     return formatPublishTerminalSuccess({ acknowledgement, deployment });
 };
@@ -1619,10 +1664,28 @@ program
     .option('--config <path>', 'Auth config path', process.env.FUNNELSGROVE_CONFIG || getDefaultAuthConfigPath());
 addExamples(program, [
     'fgrove login',
+    'fgrove update',
     'fgrove sync down --funnel claimbee-ios --dir ./claimbee-ios',
     'cd ./claimbee-ios && fgrove status',
     'fgrove publish --env preview',
 ]);
+addExamples(program
+    .command('update')
+    .description('Update every global fgrove installation found on PATH')
+    .option('--dry-run', 'List installations without changing them'), [
+    'fgrove update',
+    'fgrove update --dry-run',
+])
+    .action(async (options) => {
+    const installations = await updateCliInstallations({
+        dryRun: options.dryRun,
+        entrypointPath: process.argv[1],
+        report: (message) => console.error(message),
+    });
+    console.log(options.dryRun
+        ? `Found ${installations.length} global fgrove installation${installations.length === 1 ? '' : 's'}.`
+        : `Updated ${installations.length} global fgrove installation${installations.length === 1 ? '' : 's'} to the latest release.`);
+});
 addExamples(program
     .command('login')
     .description('Authorize this CLI with your FunnelsGrove account')
@@ -2846,8 +2909,10 @@ addExamples(program
         throw new Error('--domain is required when publishing production');
     }
     const sourceDir = path.resolve(process.cwd(), options.dir);
+    console.error('Publish: validating local funnel...');
     await assertFunnelValidForMutation(sourceDir);
     const token = await readAuthToken();
+    console.error('Publish: resolving funnel target...');
     const target = await resolveSyncTarget({
         token,
         workspace: options.workspace,
@@ -2855,6 +2920,7 @@ addExamples(program
         dir: options.dir,
     });
     if (shouldSyncGitHubDraft(options)) {
+        console.error('Publish: checking GitHub draft sync...');
         await syncGitHubDraftForCli({
             token,
             workspaceId: target.workspaceId,
@@ -2868,6 +2934,7 @@ addExamples(program
         funnelId: target.funnelId,
         message: options.message,
         domains: publishEnv === 'production' && options.domain ? [options.domain] : undefined,
+        onProgress: (message) => console.error(message),
     }));
 });
 const githubCommand = addExamples(program.command('github').description('Manage GitHub funnel sync'), [

package/dist/contractCompatibility.js

@@ -13,7 +13,7 @@ export class ContractCompatibilityError extends Error {
 }
 const SHA256 = /^[a-f0-9]{64}$/;
 const SEMVER = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/;
-const UPDATE_COMMAND = 'npm install -g @funnelsgrove/cli@latest';
+const UPDATE_COMMAND = 'fgrove update';
 const DEFAULT_TIMEOUT_MS = 3_000;
 const MAX_TIMEOUT_MS = 10_000;
 const MAX_HEALTH_RESPONSE_BYTES = 64 * 1_024;

package/dist/emailCommands.js

@@ -113,7 +113,7 @@ export async function executeEmailSequenceCancel(input, dependencies = {}) {
     const remote = await emailApiRequest({
         apiUrl: input.apiUrl,
         privateToken: input.privateToken,
-        path: `/sdk/private/sequences/${encodeURIComponent(sequence.id)}`,
+        path: `/integration/v1/email/sequences/${encodeURIComponent(sequence.id)}`,
         fetchImpl: dependencies.fetchImpl || fetch,
     });
     if (!isRecord(remote.sequence)
@@ -124,7 +124,7 @@ export async function executeEmailSequenceCancel(input, dependencies = {}) {
     const response = await emailApiRequest({
         apiUrl: input.apiUrl,
         privateToken: input.privateToken,
-        path: `/sdk/private/sequences/${encodeURIComponent(sequence.id)}/enrollments/${encodeURIComponent(input.funnelEndUserId)}/cancel`,
+        path: `/integration/v1/email/sequences/${encodeURIComponent(sequence.id)}/enrollments/${encodeURIComponent(input.funnelEndUserId)}/cancel`,
         method: 'POST',
         body: { reason: input.reason },
         fetchImpl: dependencies.fetchImpl || fetch,

package/dist/selfUpdate.d.ts

@@ -0,0 +1,24 @@
+import { access, realpath } from 'node:fs/promises';
+export type CliInstallation = {
+    prefix: string;
+    executablePath: string;
+    npmExecutablePath: string;
+};
+type RunCommand = (command: string, args: string[]) => Promise<void>;
+export declare const deriveGlobalCliPrefix: (realExecutablePath: string) => string | null;
+export declare const discoverCliInstallations: (input?: {
+    pathValue?: string;
+    entrypointPath?: string;
+    platform?: NodeJS.Platform;
+    realpathFn?: typeof realpath;
+    accessFn?: typeof access;
+}) => Promise<CliInstallation[]>;
+export declare const updateCliInstallations: (input?: {
+    dryRun?: boolean;
+    pathValue?: string;
+    entrypointPath?: string;
+    installations?: CliInstallation[];
+    runCommand?: RunCommand;
+    report?: (message: string) => void;
+}) => Promise<CliInstallation[]>;
+export {};

package/dist/selfUpdate.js

@@ -0,0 +1,82 @@
+import { constants as fsConstants } from 'node:fs';
+import { access, realpath } from 'node:fs/promises';
+import { spawn } from 'node:child_process';
+import path from 'node:path';
+const CLI_PACKAGE = '@funnelsgrove/cli@latest';
+const runCommandWithInheritedIo = async (command, args) => {
+    await new Promise((resolve, reject) => {
+        const child = spawn(command, args, { stdio: 'inherit' });
+        child.once('error', reject);
+        child.once('exit', (code, signal) => {
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(signal
+                ? `${command} was terminated by ${signal}.`
+                : `${command} exited with code ${code ?? 'unknown'}.`));
+        });
+    });
+};
+export const deriveGlobalCliPrefix = (realExecutablePath) => {
+    const normalized = path.resolve(realExecutablePath);
+    const marker = `${path.sep}lib${path.sep}node_modules${path.sep}@funnelsgrove${path.sep}cli${path.sep}`;
+    const markerIndex = normalized.indexOf(marker);
+    if (markerIndex < 1)
+        return null;
+    return normalized.slice(0, markerIndex);
+};
+export const discoverCliInstallations = async (input = {}) => {
+    const platform = input.platform || process.platform;
+    const realpathFn = input.realpathFn || realpath;
+    const accessFn = input.accessFn || access;
+    const executableName = platform === 'win32' ? 'fgrove.cmd' : 'fgrove';
+    const npmName = platform === 'win32' ? 'npm.cmd' : 'npm';
+    const candidates = (input.pathValue ?? process.env.PATH ?? '')
+        .split(path.delimiter)
+        .filter(Boolean)
+        .map((directory) => path.join(directory, executableName));
+    if (input.entrypointPath)
+        candidates.push(input.entrypointPath);
+    const installations = new Map();
+    for (const candidate of candidates) {
+        try {
+            await accessFn(candidate, fsConstants.X_OK);
+            const realExecutablePath = await realpathFn(candidate);
+            const prefix = deriveGlobalCliPrefix(realExecutablePath);
+            if (!prefix || installations.has(prefix))
+                continue;
+            const executablePath = path.join(prefix, 'bin', executableName);
+            const npmExecutablePath = path.join(prefix, 'bin', npmName);
+            await accessFn(npmExecutablePath, fsConstants.X_OK);
+            installations.set(prefix, { prefix, executablePath, npmExecutablePath });
+        }
+        catch {
+            // PATH commonly contains directories without fgrove; those are not installations.
+        }
+    }
+    return [...installations.values()].sort((left, right) => left.prefix.localeCompare(right.prefix));
+};
+export const updateCliInstallations = async (input = {}) => {
+    const installations = input.installations || await discoverCliInstallations({
+        pathValue: input.pathValue,
+        entrypointPath: input.entrypointPath,
+    });
+    if (installations.length === 0) {
+        throw new Error('No global fgrove installation was found on PATH. Install it with npm install -g @funnelsgrove/cli@latest.');
+    }
+    const runCommand = input.runCommand || runCommandWithInheritedIo;
+    for (const installation of installations) {
+        input.report?.(`${input.dryRun ? 'Found' : 'Updating'} fgrove at ${installation.executablePath}`);
+        if (input.dryRun)
+            continue;
+        await runCommand(installation.npmExecutablePath, [
+            'install',
+            '--global',
+            '--prefix',
+            installation.prefix,
+            CLI_PACKAGE,
+        ]);
+    }
+    return installations;
+};

package/funnel-contract-compatibility.json

@@ -4,10 +4,10 @@
   "minimumCliVersion": "0.1.20",
   "entries": [
     {
-      "repositoryCliVersion": "0.1.143",
+      "repositoryCliVersion": "0.1.147",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.133",
+        "bundleVersion": "2.0.137",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -45,7 +45,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
+            "sha256": "d540fec73ced6fdcc2d118aac9a2f1f1131dfbd7d4fa6df80d988733725ffcbb"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -61,7 +61,7 @@
           },
           {
             "path": "docs/funnelsgrove/qa/publish.md",
-            "sha256": "82b05b8c6eebf25d32d2cff6f05b08bc39661dcbb46caa6b912de6b803aed39c"
+            "sha256": "67391a8bf5e1ddeab2e7430f48a589c28ce5fb986f06fee74f78f09649086603"
           },
           {
             "path": "docs/funnelsgrove/recipes/add-experiment.md",
@@ -145,22 +145,22 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
+            "sha256": "66145b48217b80e9e5eb0b21d2d4d8de7186ed980a54b01b56b2a23202822503"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.142",
+      "repositoryCliVersion": "0.1.146",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.132",
+        "bundleVersion": "2.0.136",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
           {
             "path": "AGENTS.md",
-            "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+            "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
           },
           {
             "path": "CLAUDE.md",
@@ -192,7 +192,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "33d225bcc4f6f7aaa473f3bebe81799b3ec4751c374a4c2d9159afc56415ba74"
+            "sha256": "f0960bc044d9c4e5a550e5bc968fefd0840c03829ecb94348736798fc8fa9d1b"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -208,7 +208,7 @@
           },
           {
             "path": "docs/funnelsgrove/qa/publish.md",
-            "sha256": "82b05b8c6eebf25d32d2cff6f05b08bc39661dcbb46caa6b912de6b803aed39c"
+            "sha256": "67391a8bf5e1ddeab2e7430f48a589c28ce5fb986f06fee74f78f09649086603"
           },
           {
             "path": "docs/funnelsgrove/recipes/add-experiment.md",
@@ -292,22 +292,22 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "ea5b05c7f28303245e358598f125a3a31c15175c2ef15ae8873b25be2ded133e"
+            "sha256": "57bb326172c83897a6656615a8ddc1b19bc9eeee808cd07f33ec2fb708102942"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.141",
+      "repositoryCliVersion": "0.1.145",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.131",
+        "bundleVersion": "2.0.135",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
           {
             "path": "AGENTS.md",
-            "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+            "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
           },
           {
             "path": "CLAUDE.md",
@@ -339,7 +339,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "015d013594cabb94c288bb39d7c717f531b68a1fe4754e6baefc0e08bbc5b872"
+            "sha256": "0b3708beaa8d63e1c1fe5ab38e39fdf7a3e12fec39166261a1bad7619d872179"
           },
           {
             "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,22 +439,22 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "7af952690a2b3c592ce6688b8524aa4c5fe111a0c798dc25106eb0d594c2452b"
+            "sha256": "7fa793bde89dc1106b24eb408f225d156865bffe37f4feb7aeadb553844643c8"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.140",
+      "repositoryCliVersion": "0.1.144",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.130",
+        "bundleVersion": "2.0.134",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
           {
             "path": "AGENTS.md",
-            "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+            "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
           },
           {
             "path": "CLAUDE.md",
@@ -486,7 +486,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "9988e6f7b4ecf3f4a73ff83cf3f3613f82d765c59d09e55e86b0560d1e3eafa5"
+            "sha256": "fec5ced4b8e8e6c8081f5446b3b4174caefa89ac6d441f03e576fb10e961bc98"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -586,22 +586,22 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "4e81bd56071fa38708c7f18488420038339c8cc984062ffd7e8a4930ab6b06f0"
+            "sha256": "efdede3e20f75d3b6f5dc00daa3e8ee1c3c03d56978fa087161b643424add0cc"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.139",
+      "repositoryCliVersion": "0.1.143",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.129",
+        "bundleVersion": "2.0.133",
         "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": "2a6ffbd2768cf73b049b4b067c003c81c2e3d3679fea6bf3f2865ddf419983f4"
+            "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -733,16 +733,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "adda37f1991ccbb5e7abf2b9f1465688c116e6604b08a3d63f104b295a93140b"
+            "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.138",
+      "repositoryCliVersion": "0.1.142",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.128",
+        "bundleVersion": "2.0.132",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -780,7 +780,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "ac3397d4724b3653080cb43f6b01bfc43e65da4acb867592974ef106d6833bcf"
+            "sha256": "33d225bcc4f6f7aaa473f3bebe81799b3ec4751c374a4c2d9159afc56415ba74"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -880,16 +880,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "793db126d3f299dfc98bd4dd715dfd5183d155557e32ec401491397364da5475"
+            "sha256": "ea5b05c7f28303245e358598f125a3a31c15175c2ef15ae8873b25be2ded133e"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.136",
+      "repositoryCliVersion": "0.1.141",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.126",
+        "bundleVersion": "2.0.131",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -927,7 +927,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "6a7b8bea3fa6b4245307e96b51872fe04ab576c3a9161314f90c00cf6415465c"
+            "sha256": "015d013594cabb94c288bb39d7c717f531b68a1fe4754e6baefc0e08bbc5b872"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -1027,7 +1027,7 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "8b1218c5e5343b2c3e00079170da131aff33f5a808365700f8eab62dbf7433b9"
+            "sha256": "7af952690a2b3c592ce6688b8524aa4c5fe111a0c798dc25106eb0d594c2452b"
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/cli",
-  "version": "0.1.143",
+  "version": "0.1.147",
   "description": "FunnelsGrove command-line tools for editing, syncing, and publishing funnels",
   "repository": {
     "type": "git",
@@ -34,12 +34,12 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@funnelsgrove/runtime": "0.7.27",
+    "@funnelsgrove/runtime": "0.7.28",
     "commander": "^12.0.0",
     "typescript": "^5.8.3"
   },
   "devDependencies": {
-    "@funnelsgrove/analytics": "0.1.76",
+    "@funnelsgrove/analytics": "0.1.77",
     "@funnelsgrove/payments": "0.7.19",
     "vitest": "^3.0.0"
   }

package/template_docs/.funnelsgrove-docs.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.133",
+  "bundleVersion": "2.0.137",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
+      "sha256": "d540fec73ced6fdcc2d118aac9a2f1f1131dfbd7d4fa6df80d988733725ffcbb"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -54,7 +54,7 @@
     },
     {
       "path": "docs/funnelsgrove/qa/publish.md",
-      "sha256": "82b05b8c6eebf25d32d2cff6f05b08bc39661dcbb46caa6b912de6b803aed39c"
+      "sha256": "67391a8bf5e1ddeab2e7430f48a589c28ce5fb986f06fee74f78f09649086603"
     },
     {
       "path": "docs/funnelsgrove/recipes/add-experiment.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
+      "sha256": "66145b48217b80e9e5eb0b21d2d4d8de7186ed980a54b01b56b2a23202822503"
     }
   ]
 }

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.27` first, then `@funnelsgrove/analytics` `0.1.76`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.143`, 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.147`, 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/docs/funnelsgrove/qa/publish.md

@@ -22,6 +22,7 @@ Contract hash: `d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf
 1. Run `fgrove status`, `git status --short`, tests, lint, `fgrove validate`, and relevant local/analytics/payment QA.
 2. Choose exactly one source path. GitHub-connected funnels use git push, `fgrove github pull`, terminal status, then publish; never use `fgrove sync up` for the same diff. Non-GitHub funnels use `fgrove sync up`.
 3. Publish preview with a clear message.
+   `fgrove publish` reports validation, GitHub sync, queue, build, image optimization, and upload progress on stderr; its final URL/version row remains the only stdout output. If compatibility guidance requests a newer CLI, run `fgrove update` so every NVM/Homebrew installation visible on `PATH` is updated together.
 4. Test the preview URL across supported breakpoints and real navigation entry points.
 5. Confirm preview-mode suppression and production configuration separation.
 6. Review route, analytics, answer, experiment, and payment evidence.

package/template_docs/funnel-docs.config.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.133",
+  "bundleVersion": "2.0.137",
   "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.133",
+  "bundleVersion": "2.0.137",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
+      "sha256": "d540fec73ced6fdcc2d118aac9a2f1f1131dfbd7d4fa6df80d988733725ffcbb"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -54,7 +54,7 @@
     },
     {
       "path": "docs/funnelsgrove/qa/publish.md",
-      "sha256": "82b05b8c6eebf25d32d2cff6f05b08bc39661dcbb46caa6b912de6b803aed39c"
+      "sha256": "67391a8bf5e1ddeab2e7430f48a589c28ce5fb986f06fee74f78f09649086603"
     },
     {
       "path": "docs/funnelsgrove/recipes/add-experiment.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
+      "sha256": "66145b48217b80e9e5eb0b21d2d4d8de7186ed980a54b01b56b2a23202822503"
     }
   ]
 }

package/template_scaffold/.funnelsgrove-scaffold.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 1,
-  "sourceTreeHash": "d2169824240f132d22d886aa9be81f9c4148f8166e9e49aa48534713c3dcd032",
+  "sourceTreeHash": "8da6658b5eeea395b12f5c678e5a2da0b8b091bc15e1697f5d3e15fa5d9bc8a2",
   "stepContractVersion": 3,
-  "docsBundleVersion": "2.0.133",
+  "docsBundleVersion": "2.0.137",
   "files": [
     {
       "path": ".env.example",
@@ -16,7 +16,7 @@
     },
     {
       "path": ".funnelsgrove-docs.json",
-      "sha256": "050e0b96acb57586d7c373bf46598eccea5f409e9f655440a8e0346cdc764523",
+      "sha256": "82a866e08ec6245d26cc6f754960f78e39f8c9086c44eb3eea141c09add16090",
       "mode": "100644"
     },
     {
@@ -101,7 +101,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829",
+      "sha256": "d540fec73ced6fdcc2d118aac9a2f1f1131dfbd7d4fa6df80d988733725ffcbb",
       "mode": "100644"
     },
     {
@@ -121,7 +121,7 @@
     },
     {
       "path": "docs/funnelsgrove/qa/publish.md",
-      "sha256": "82b05b8c6eebf25d32d2cff6f05b08bc39661dcbb46caa6b912de6b803aed39c",
+      "sha256": "67391a8bf5e1ddeab2e7430f48a589c28ce5fb986f06fee74f78f09649086603",
       "mode": "100644"
     },
     {
@@ -236,7 +236,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f",
+      "sha256": "66145b48217b80e9e5eb0b21d2d4d8de7186ed980a54b01b56b2a23202822503",
       "mode": "100644"
     },
     {
@@ -261,12 +261,12 @@
     },
     {
       "path": "package-lock.json",
-      "sha256": "8f60d0578889cf9433a5b383f9d243da0f36b22b50bc76354d44c35adf2eba56",
+      "sha256": "868bf077f8518811654f8121fb1490a4c8d5817d572bc6d37f672e1a2e68f076",
       "mode": "100644"
     },
     {
       "path": "package.json",
-      "sha256": "931094eb8a5eb373bb956422ec4ba0d50abb25c4525867b22bad6b64ef034318",
+      "sha256": "64fd73809a410d0310f6763b4c2d3a9b688c5cd8fd3423686cf23197a04eaadc",
       "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.27` first, then `@funnelsgrove/analytics` `0.1.76`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.143`, 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.147`, 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/docs/funnelsgrove/qa/publish.md

@@ -22,6 +22,7 @@ Contract hash: `d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf
 1. Run `fgrove status`, `git status --short`, tests, lint, `fgrove validate`, and relevant local/analytics/payment QA.
 2. Choose exactly one source path. GitHub-connected funnels use git push, `fgrove github pull`, terminal status, then publish; never use `fgrove sync up` for the same diff. Non-GitHub funnels use `fgrove sync up`.
 3. Publish preview with a clear message.
+   `fgrove publish` reports validation, GitHub sync, queue, build, image optimization, and upload progress on stderr; its final URL/version row remains the only stdout output. If compatibility guidance requests a newer CLI, run `fgrove update` so every NVM/Homebrew installation visible on `PATH` is updated together.
 4. Test the preview URL across supported breakpoints and real navigation entry points.
 5. Confirm preview-mode suppression and production configuration separation.
 6. Review route, analytics, answer, experiment, and payment evidence.

package/template_scaffold/funnel-docs.config.json

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

package/template_scaffold/package-lock.json

@@ -8,9 +8,9 @@
       "name": "funnel-template",
       "version": "0.1.0",
       "dependencies": {
-        "@funnelsgrove/analytics": "^0.1.76",
+        "@funnelsgrove/analytics": "^0.1.77",
         "@funnelsgrove/payments": "^0.7.19",
-        "@funnelsgrove/runtime": "^0.7.27",
+        "@funnelsgrove/runtime": "^0.7.28",
         "@stripe/react-stripe-js": "^5.6.0",
         "@stripe/stripe-js": "^8.7.0",
         "lucide-react": "^0.553.0",
@@ -938,11 +938,11 @@
       }
     },
     "node_modules/@funnelsgrove/analytics": {
-      "version": "0.1.76",
-      "resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.1.76.tgz",
-      "integrity": "sha512-5Zf0zxZ4GXRpwfHTAcJX1sk07tiFrfC7TVB1dZueyNosFcKl6+o9omVE5/euoJ0uJsblPGTzJDW8+wdyK2MbzA==",
+      "version": "0.1.77",
+      "resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.1.77.tgz",
+      "integrity": "sha512-vzE3DSBWplM0SS0xx2sDIdsBFNF+Rz8JWsDVFrztqPpN0llRzx4BpEXoA8zvo/x0hERQ5XXPHmT0AYVTG3FDsw==",
       "dependencies": {
-        "@funnelsgrove/runtime": "0.7.27"
+        "@funnelsgrove/runtime": "0.7.28"
       }
     },
     "node_modules/@funnelsgrove/payments": {
@@ -961,9 +961,9 @@
       }
     },
     "node_modules/@funnelsgrove/runtime": {
-      "version": "0.7.27",
-      "resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.7.27.tgz",
-      "integrity": "sha512-FiVI6rmV8BhtRowV46Cm4bqgr2UvYUCI/yyW41lhiYYcnolVxNYyaO++j8FlkqXn99JvPPauSHC6dtLvmojeEg==",
+      "version": "0.7.28",
+      "resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.7.28.tgz",
+      "integrity": "sha512-pHN8nCWDMj7WSwKiTsLwyhEm0uEo/Q1w05ODz6R4qW8E8BzidRDtR2hPDJKy90PQEuMVqViNMuOVAOh85PsDsw==",
       "dependencies": {
         "posthog-js": "^1.369.2",
         "react": "19.2.3",

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.1.76",
+    "@funnelsgrove/analytics": "^0.1.77",
     "@funnelsgrove/payments": "^0.7.19",
-    "@funnelsgrove/runtime": "^0.7.27",
+    "@funnelsgrove/runtime": "^0.7.28",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",
     "lucide-react": "^0.553.0",

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>