@funnelsgrove/cli 0.1.140 → 0.1.143

package/README.md

@@ -30,13 +30,22 @@ 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 sync down` refuses to overwrite local changes in an existing synced
-folder. If `fgrove sync up` says the remote draft changed since your local sync,
-run `fgrove sync rebase`: it performs a three-way merge from the recorded base,
-preserves CLI-managed files, and leaves the working tree untouched when it finds
-conflicts. Review the merged diff, rerun `fgrove validate`, then sync up again.
+folder. `fgrove sync up` sends only changed and deleted paths in one atomic
+draft patch. Disjoint concurrent edits are rebased automatically; if the same
+path changed remotely, run `fgrove sync rebase`: it performs a three-way merge
+from the recorded base, preserves CLI-managed files, and leaves the working tree
+untouched when it finds conflicts. Review the merged diff, rerun `fgrove
+validate`, then sync up again.
 `sync down --force` is the explicit discard path and writes an automatic source
 backup under `.funnelsgrove/rebase-backups/` before replacing hosted paths.
 
+Changed images below `public/` are uploaded directly to asset storage, then the
+small immutable asset references are included in the atomic patch. Sync retries
+use a deterministic durable idempotency key, so a lost response cannot create a
+second draft version. The CLI automatically falls back to candidate sync when
+the compatible deployed API lacks the fast procedures or a change set exceeds
+patch limits.
+
 `fgrove sync up` is for funnels without GitHub source sync. When GitHub is
 connected, commit and push source changes with normal git, then run `fgrove
 github pull` to sync GitHub into the hosted draft. Do not run `fgrove sync up`

package/dist/apiClient.d.ts

@@ -18,6 +18,47 @@ export type FunnelSourceCandidateApiContext = {
     fetchFn?: FetchFn;
     signal?: AbortSignal;
 };
+export type DraftPatchFile = {
+    path: string;
+    content: string;
+    contentType?: string;
+};
+export type ApplyDraftPatchInput = {
+    workspaceId: string;
+    funnelId: string;
+    baseDraftVersionId: string | null;
+    idempotencyKey: string;
+    message?: string;
+    changedFiles: DraftPatchFile[];
+    deletedPaths: string[];
+};
+export type ApplyDraftPatchResult = {
+    funnelId: string;
+    previousDraftVersionId: string | null;
+    draftVersionId: string;
+    draftVersionSeq: number;
+    rebasedFromVersionId: string | null;
+    changedPaths: string[];
+    deletedPaths: string[];
+    changedContentBytes: number;
+    idempotent: boolean;
+};
+export type DirectAssetUploadDescription = {
+    workspaceId: string;
+    funnelId: string;
+    path: string;
+    contentType: string;
+    sizeBytes: number;
+    sha256: string;
+};
+export type PreparedDirectAssetUpload = Omit<DirectAssetUploadDescription, 'workspaceId' | 'funnelId'> & {
+    uploadKey: string;
+    uploadUrl: string;
+    uploadHeaders: Record<string, string>;
+};
+export type FinalizeDirectAssetUploadInput = DirectAssetUploadDescription & {
+    uploadKey: string;
+};
 export type CreateFunnelExperimentFromSpecInput = {
     workspaceId: string;
     funnelId: string;
@@ -96,6 +137,12 @@ export declare class FunnelContractApiError extends Error {
     readonly funnelContract: FunnelContractApiErrorData;
     constructor(message: string, funnelContract: FunnelContractApiErrorData);
 }
+export declare class TrpcApiError extends Error {
+    readonly code: string | null;
+    readonly httpStatus: number | null;
+    constructor(message: string, code: string | null, httpStatus: number | null);
+}
+export declare const isMissingTrpcProcedureError: (error: unknown) => boolean;
 export declare const parseFunnelContractApiErrorData: (value: unknown) => FunnelContractApiErrorData | null;
 export declare function parseTrpcJsonResponse<T = unknown>(response: unknown): T;
 export declare function callTrpcProcedure<T = unknown>(input: TrpcCallInput): Promise<T>;
@@ -103,5 +150,8 @@ export declare const beginFunnelSourceCandidate: (context: FunnelSourceCandidate
 export declare const stageFunnelSourceCandidate: (context: FunnelSourceCandidateApiContext, input: StageFunnelSourceCandidateInput) => Promise<StageFunnelSourceCandidateResult>;
 export declare const finalizeFunnelSourceCandidate: (context: FunnelSourceCandidateApiContext, input: FinalizeFunnelSourceCandidateInput) => Promise<FinalizeFunnelSourceCandidateResult>;
 export declare const abortFunnelSourceCandidate: (context: FunnelSourceCandidateApiContext, input: FinishFunnelSourceCandidateInput) => Promise<FunnelSourceCandidateSummary>;
+export declare const applyFunnelDraftPatch: (context: FunnelSourceCandidateApiContext, input: ApplyDraftPatchInput) => Promise<ApplyDraftPatchResult>;
+export declare const prepareFunnelDirectAssetUpload: (context: FunnelSourceCandidateApiContext, input: DirectAssetUploadDescription) => Promise<PreparedDirectAssetUpload>;
+export declare const finalizeFunnelDirectAssetUpload: (context: FunnelSourceCandidateApiContext, input: FinalizeDirectAssetUploadInput) => Promise<DraftPatchFile>;
 export declare const createFunnelExperimentFromSpec: (context: FunnelSourceCandidateApiContext, input: CreateFunnelExperimentFromSpecInput) => Promise<ExperimentCreateResponse>;
 export {};

package/dist/apiClient.js

@@ -48,6 +48,19 @@ export class FunnelContractApiError extends Error {
         this.funnelContract = funnelContract;
     }
 }
+export class TrpcApiError extends Error {
+    code;
+    httpStatus;
+    constructor(message, code, httpStatus) {
+        super(`tRPC request failed: ${message}`);
+        this.code = code;
+        this.httpStatus = httpStatus;
+        this.name = 'TrpcApiError';
+    }
+}
+export const isMissingTrpcProcedureError = (error) => (error instanceof TrpcApiError
+    && error.code === 'NOT_FOUND'
+    && /no procedure found on path/i.test(error.message));
 const ENVELOPE_KEYS = Object.freeze([
     'schemaVersion',
     'contractVersion',
@@ -238,7 +251,14 @@ export function parseTrpcJsonResponse(response) {
         if (funnelContract) {
             throw new FunnelContractApiError(message, funnelContract);
         }
-        throw new Error(`tRPC request failed: ${message}`);
+        const data = ownDataValue(errorValue, 'data');
+        const code = isObject(data) && typeof ownDataValue(data, 'code') === 'string'
+            ? ownDataValue(data, 'code')
+            : null;
+        const httpStatus = isObject(data) && typeof ownDataValue(data, 'httpStatus') === 'number'
+            ? ownDataValue(data, 'httpStatus')
+            : null;
+        throw new TrpcApiError(message, code, httpStatus);
     }
     const result = ownDataValue(response, 'result');
     if (!isObject(result)) {
@@ -316,6 +336,9 @@ export const beginFunnelSourceCandidate = (context, input) => callFunnelSourceCa
 export const stageFunnelSourceCandidate = (context, input) => callFunnelSourceCandidateMutation(context, 'funnels.stageSourceCandidate', input);
 export const finalizeFunnelSourceCandidate = (context, input) => callFunnelSourceCandidateMutation(context, 'funnels.finalizeSourceCandidate', input);
 export const abortFunnelSourceCandidate = (context, input) => callFunnelSourceCandidateMutation(context, 'funnels.abortSourceCandidate', input);
+export const applyFunnelDraftPatch = (context, input) => callFunnelSourceCandidateMutation(context, 'funnels.applyDraftPatch', input);
+export const prepareFunnelDirectAssetUpload = (context, input) => callFunnelSourceCandidateMutation(context, 'funnels.prepareDirectAssetUpload', input);
+export const finalizeFunnelDirectAssetUpload = (context, input) => callFunnelSourceCandidateMutation(context, 'funnels.finalizeDirectAssetUpload', input);
 export const createFunnelExperimentFromSpec = (context, input) => callTrpcProcedure({
     ...context,
     path: 'funnelExperiments.createFromSpec',

package/dist/cli.js

@@ -8,13 +8,14 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Command } from 'commander';
 import { CURRENT_STEP_CONTRACT_VERSION, FUNNEL_CONTRACT_DIAGNOSTIC_CODES, PREVIOUS_STEP_CONTRACT_VERSION, createFunnelContractDiagnostic, } from '@funnelsgrove/runtime';
-import { abortFunnelSourceCandidate, beginFunnelSourceCandidate, callTrpcProcedure, createFunnelExperimentFromSpec, finalizeFunnelSourceCandidate, stageFunnelSourceCandidate, } from './apiClient.js';
+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 { mergeTextSourceWithGit } from './sourceRebase.js';
 import { executeExperimentCreate, formatExperimentCreateSuccess, recoverExperimentCreateTransaction, } from './experimentCreate.js';
 import { pullEnvFile } from './envSync.js';
+import { executeFastDraftPatchSync, uploadDirectAssetWithFetch } from './draftPatchSync.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';
@@ -2666,7 +2667,7 @@ addExamples(envCommand
 });
 addExamples(syncCommand
     .command('up')
-    .description('Upload local source into a new funnel draft version for funnels without GitHub source sync')
+    .description('Atomically upload changed local paths into the hosted draft for funnels without GitHub source sync')
     .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', '.')
@@ -2719,40 +2720,59 @@ addExamples(syncCommand
         process.once('SIGINT', cancel);
         process.once('SIGTERM', cancel);
         try {
-            const candidateResult = await runSourceCandidateSync({
+            const apiContext = {
+                apiUrl: getApiUrl(),
+                token,
+                signal: cancellation.signal,
+            };
+            const patchResult = await executeFastDraftPatchSync({
                 workspaceId: target.workspaceId,
                 funnelId: target.funnelId,
                 baseDraftVersionId: changes.currentManifest.draftVersionId,
                 message: options.message,
-                operations: buildSourceCandidateOperations({
-                    previousFiles: target.manifest?.files ?? [],
-                    files: changes.files,
-                    deletedPaths: changes.deletedPaths,
-                }),
+                files: changes.files,
+                deletedPaths: changes.deletedPaths,
                 signal: cancellation.signal,
                 api: {
-                    begin: (input) => beginFunnelSourceCandidate({
-                        apiUrl: getApiUrl(),
-                        token,
-                        signal: cancellation.signal,
-                    }, input),
-                    stage: (input) => stageFunnelSourceCandidate({
-                        apiUrl: getApiUrl(),
-                        token,
-                        signal: cancellation.signal,
-                    }, input),
-                    finalize: (input) => finalizeFunnelSourceCandidate({
-                        apiUrl: getApiUrl(),
-                        token,
-                        signal: cancellation.signal,
-                    }, input),
-                    abort: (input) => abortFunnelSourceCandidate({
-                        apiUrl: getApiUrl(),
-                        token,
-                    }, input),
+                    apply: (input) => applyFunnelDraftPatch(apiContext, input),
+                    prepareAsset: (input) => prepareFunnelDirectAssetUpload(apiContext, input),
+                    uploadAsset: uploadDirectAssetWithFetch,
+                    finalizeAsset: (input) => finalizeFunnelDirectAssetUpload(apiContext, input),
                 },
             });
-            result = { versionId: candidateResult.versionId };
+            if (patchResult.kind === 'committed') {
+                result = { versionId: patchResult.result.draftVersionId };
+                if (patchResult.directAssetCount > 0) {
+                    console.log(`Uploaded ${patchResult.directAssetCount} changed image${patchResult.directAssetCount === 1 ? '' : 's'} directly to asset storage.`);
+                }
+            }
+            else {
+                console.warn(patchResult.reason === 'legacy-api'
+                    ? 'The API does not support fast draft patches yet; using compatible source sync.'
+                    : 'This change set exceeds fast draft patch limits; using compatible source sync.');
+                const candidateResult = await runSourceCandidateSync({
+                    workspaceId: target.workspaceId,
+                    funnelId: target.funnelId,
+                    baseDraftVersionId: changes.currentManifest.draftVersionId,
+                    message: options.message,
+                    operations: buildSourceCandidateOperations({
+                        previousFiles: target.manifest?.files ?? [],
+                        files: changes.files,
+                        deletedPaths: changes.deletedPaths,
+                    }),
+                    signal: cancellation.signal,
+                    api: {
+                        begin: (input) => beginFunnelSourceCandidate(apiContext, input),
+                        stage: (input) => stageFunnelSourceCandidate(apiContext, input),
+                        finalize: (input) => finalizeFunnelSourceCandidate(apiContext, input),
+                        abort: (input) => abortFunnelSourceCandidate({
+                            apiUrl: getApiUrl(),
+                            token,
+                        }, input),
+                    },
+                });
+                result = { versionId: candidateResult.versionId };
+            }
         }
         finally {
             process.off('SIGINT', cancel);

package/dist/draftPatchSync.d.ts

@@ -0,0 +1,39 @@
+import type { ApplyDraftPatchInput, ApplyDraftPatchResult, DirectAssetUploadDescription, DraftPatchFile, FinalizeDirectAssetUploadInput, PreparedDirectAssetUpload } from './apiClient.js';
+import { type SourceFile } from './localSync.js';
+export type DraftPatchSyncApi = {
+    apply: (input: ApplyDraftPatchInput) => Promise<ApplyDraftPatchResult>;
+    prepareAsset: (input: DirectAssetUploadDescription) => Promise<PreparedDirectAssetUpload>;
+    uploadAsset: (input: {
+        uploadUrl: string;
+        uploadHeaders: Record<string, string>;
+        body: Uint8Array;
+        signal?: AbortSignal;
+    }) => Promise<void>;
+    finalizeAsset: (input: FinalizeDirectAssetUploadInput) => Promise<DraftPatchFile>;
+};
+export type DraftPatchSyncResult = {
+    kind: 'committed';
+    result: ApplyDraftPatchResult;
+    directAssetCount: number;
+} | {
+    kind: 'fallback';
+    reason: 'unsupported-patch' | 'legacy-api';
+};
+export declare const uploadDirectAssetWithFetch: (input: {
+    uploadUrl: string;
+    uploadHeaders: Record<string, string>;
+    body: Uint8Array;
+    signal?: AbortSignal;
+    fetchFn?: typeof fetch;
+}) => Promise<void>;
+export declare const executeFastDraftPatchSync: (input: {
+    workspaceId: string;
+    funnelId: string;
+    baseDraftVersionId: string | null;
+    message?: string;
+    files: readonly SourceFile[];
+    deletedPaths: readonly string[];
+    signal?: AbortSignal;
+    uploadConcurrency?: number;
+    api: DraftPatchSyncApi;
+}) => Promise<DraftPatchSyncResult>;

package/dist/draftPatchSync.js

@@ -0,0 +1,132 @@
+import { createHash } from 'node:crypto';
+import { isMissingTrpcProcedureError } from './apiClient.js';
+import { sourceFileBytes } from './localSync.js';
+const MAX_PATCH_FILES = 600;
+const MAX_PATCH_FILE_CONTENT_CHARS = 3_000_000;
+const MAX_PATCH_CONTENT_BYTES = 65_000_000;
+const MAX_DIRECT_ASSET_BYTES = 25_000_000;
+const MAX_DIRECT_ASSET_REF_BYTES = 1_024;
+const DEFAULT_UPLOAD_CONCURRENCY = 4;
+const isDirectImage = (file) => (file.path.startsWith('public/')
+    && Boolean(file.contentType?.toLowerCase().startsWith('image/')));
+const hash = (value) => (createHash('sha256').update(value).digest('hex'));
+const mapWithConcurrency = async (values, concurrency, worker) => {
+    const results = new Array(values.length);
+    let cursor = 0;
+    const run = async () => {
+        while (cursor < values.length) {
+            const index = cursor;
+            cursor += 1;
+            results[index] = await worker(values[index]);
+        }
+    };
+    await Promise.all(Array.from({ length: Math.min(concurrency, values.length) }, () => run()));
+    return results;
+};
+const createIdempotencyKey = (input) => {
+    const payload = JSON.stringify({
+        ...input,
+        changedFiles: [...input.changedFiles]
+            .map((file) => ({
+            path: file.path,
+            contentType: file.contentType || 'text/plain',
+            contentHash: hash(file.content),
+        }))
+            .sort((left, right) => left.path.localeCompare(right.path)),
+        deletedPaths: [...input.deletedPaths].sort((left, right) => left.localeCompare(right)),
+    });
+    return `cli-sync-patch:${hash(payload)}`;
+};
+const patchIsSupported = (files, deletedPaths) => {
+    if (files.length > MAX_PATCH_FILES || deletedPaths.length > MAX_PATCH_FILES)
+        return false;
+    let projectedBytes = 0;
+    for (const file of files) {
+        if (isDirectImage(file)) {
+            const sizeBytes = sourceFileBytes(file).byteLength;
+            if (sizeBytes < 1 || sizeBytes > MAX_DIRECT_ASSET_BYTES)
+                return false;
+            projectedBytes += MAX_DIRECT_ASSET_REF_BYTES;
+            continue;
+        }
+        if (file.content.length > MAX_PATCH_FILE_CONTENT_CHARS)
+            return false;
+        projectedBytes += Buffer.byteLength(file.content, 'utf8');
+    }
+    return projectedBytes <= MAX_PATCH_CONTENT_BYTES;
+};
+export const uploadDirectAssetWithFetch = async (input) => {
+    const response = await (input.fetchFn || fetch)(input.uploadUrl, {
+        method: 'PUT',
+        headers: input.uploadHeaders,
+        body: new Uint8Array(input.body).buffer,
+        signal: input.signal,
+    });
+    if (!response.ok) {
+        throw new Error(`Direct asset upload failed with HTTP ${response.status}.`);
+    }
+};
+export const executeFastDraftPatchSync = async (input) => {
+    if (!patchIsSupported(input.files, input.deletedPaths)) {
+        return { kind: 'fallback', reason: 'unsupported-patch' };
+    }
+    const directFiles = input.files.filter(isDirectImage);
+    let uploadedAssets;
+    try {
+        const uploadConcurrency = Number.isSafeInteger(input.uploadConcurrency)
+            ? Math.min(16, Math.max(1, input.uploadConcurrency))
+            : DEFAULT_UPLOAD_CONCURRENCY;
+        uploadedAssets = await mapWithConcurrency(directFiles, uploadConcurrency, async (file) => {
+            const body = sourceFileBytes(file);
+            const description = {
+                workspaceId: input.workspaceId,
+                funnelId: input.funnelId,
+                path: file.path,
+                contentType: file.contentType,
+                sizeBytes: body.byteLength,
+                sha256: hash(body),
+            };
+            const prepared = await input.api.prepareAsset(description);
+            await input.api.uploadAsset({
+                uploadUrl: prepared.uploadUrl,
+                uploadHeaders: prepared.uploadHeaders,
+                body,
+                signal: input.signal,
+            });
+            return input.api.finalizeAsset({ ...description, uploadKey: prepared.uploadKey });
+        });
+    }
+    catch (error) {
+        if (isMissingTrpcProcedureError(error)) {
+            return { kind: 'fallback', reason: 'legacy-api' };
+        }
+        throw error;
+    }
+    const uploadedByPath = new Map(uploadedAssets.map((file) => [file.path, file]));
+    const changedFiles = input.files.map((file) => (uploadedByPath.get(file.path) ?? {
+        path: file.path,
+        content: file.content,
+        contentType: file.contentType,
+    }));
+    const requestWithoutKey = {
+        workspaceId: input.workspaceId,
+        funnelId: input.funnelId,
+        baseDraftVersionId: input.baseDraftVersionId,
+        message: input.message,
+        changedFiles,
+        deletedPaths: [...input.deletedPaths],
+    };
+    try {
+        const result = await input.api.apply({
+            ...requestWithoutKey,
+            idempotencyKey: createIdempotencyKey(requestWithoutKey),
+        });
+        return { kind: 'committed', result, directAssetCount: directFiles.length };
+    }
+    catch (error) {
+        if (isMissingTrpcProcedureError(error)) {
+            return { kind: 'fallback', reason: 'legacy-api' };
+        }
+        throw error;
+    }
+};

package/dist/localSync.d.ts

@@ -128,6 +128,7 @@ export declare function collectSourceSnapshot(rootDir: string): Promise<{
     sourceFiles: SourceFile[];
 }>;
 export declare function collectSourceFiles(rootDir: string): Promise<SourceFile[]>;
+export declare const sourceFileBytes: (file: SourceFile) => Buffer;
 export declare function rebaseSourceFiles(input: {
     baseFiles: readonly SourceFile[];
     localFiles: readonly SourceFile[];

package/dist/localSync.js

@@ -382,7 +382,7 @@ export async function collectSourceSnapshot(rootDir) {
 export async function collectSourceFiles(rootDir) {
     return (await collectSourceSnapshot(rootDir)).sourceFiles;
 }
-const sourceFileBytes = (file) => (decodeBinarySourceContent(file) ?? Buffer.from(file.content, 'utf8'));
+export const sourceFileBytes = (file) => (decodeBinarySourceContent(file) ?? Buffer.from(file.content, 'utf8'));
 const sourceFilesEqual = (left, right) => {
     if (!left || !right)
         return left === right;

package/funnel-contract-compatibility.json

@@ -4,16 +4,16 @@
   "minimumCliVersion": "0.1.20",
   "entries": [
     {
-      "repositoryCliVersion": "0.1.140",
+      "repositoryCliVersion": "0.1.143",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.130",
+        "bundleVersion": "2.0.133",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
           {
             "path": "AGENTS.md",
-            "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+            "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
           },
           {
             "path": "CLAUDE.md",
@@ -45,7 +45,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "9988e6f7b4ecf3f4a73ff83cf3f3613f82d765c59d09e55e86b0560d1e3eafa5"
+            "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -145,16 +145,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "4e81bd56071fa38708c7f18488420038339c8cc984062ffd7e8a4930ab6b06f0"
+            "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.139",
+      "repositoryCliVersion": "0.1.142",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.129",
+        "bundleVersion": "2.0.132",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -192,7 +192,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "2a6ffbd2768cf73b049b4b067c003c81c2e3d3679fea6bf3f2865ddf419983f4"
+            "sha256": "33d225bcc4f6f7aaa473f3bebe81799b3ec4751c374a4c2d9159afc56415ba74"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -292,16 +292,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "adda37f1991ccbb5e7abf2b9f1465688c116e6604b08a3d63f104b295a93140b"
+            "sha256": "ea5b05c7f28303245e358598f125a3a31c15175c2ef15ae8873b25be2ded133e"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.138",
+      "repositoryCliVersion": "0.1.141",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.128",
+        "bundleVersion": "2.0.131",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -339,7 +339,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "ac3397d4724b3653080cb43f6b01bfc43e65da4acb867592974ef106d6833bcf"
+            "sha256": "015d013594cabb94c288bb39d7c717f531b68a1fe4754e6baefc0e08bbc5b872"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -439,16 +439,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "793db126d3f299dfc98bd4dd715dfd5183d155557e32ec401491397364da5475"
+            "sha256": "7af952690a2b3c592ce6688b8524aa4c5fe111a0c798dc25106eb0d594c2452b"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.136",
+      "repositoryCliVersion": "0.1.140",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.126",
+        "bundleVersion": "2.0.130",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -486,7 +486,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "6a7b8bea3fa6b4245307e96b51872fe04ab576c3a9161314f90c00cf6415465c"
+            "sha256": "9988e6f7b4ecf3f4a73ff83cf3f3613f82d765c59d09e55e86b0560d1e3eafa5"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -586,16 +586,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "8b1218c5e5343b2c3e00079170da131aff33f5a808365700f8eab62dbf7433b9"
+            "sha256": "4e81bd56071fa38708c7f18488420038339c8cc984062ffd7e8a4930ab6b06f0"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.135",
+      "repositoryCliVersion": "0.1.139",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.125",
+        "bundleVersion": "2.0.129",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -633,7 +633,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "c7a266bb4f6614daa2a1adcfb3248f99330a8d4184866a4611268b93a4352203"
+            "sha256": "2a6ffbd2768cf73b049b4b067c003c81c2e3d3679fea6bf3f2865ddf419983f4"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -733,16 +733,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "ad9e79fd0ee9d6478567615d78e34efa272fc6a1c5f8016cd1aae64ba3e24679"
+            "sha256": "adda37f1991ccbb5e7abf2b9f1465688c116e6604b08a3d63f104b295a93140b"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.132",
+      "repositoryCliVersion": "0.1.138",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.122",
+        "bundleVersion": "2.0.128",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -780,7 +780,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "46f46756190a6085c562b9ceb2fd4a0eac961ea4f985f85a1f6e715827e171a6"
+            "sha256": "ac3397d4724b3653080cb43f6b01bfc43e65da4acb867592974ef106d6833bcf"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -880,16 +880,16 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "01ad9b12769dd8894b2aaeea0bf21e7b622c3e4ee4612987acdcb2ec5bf93d6f"
+            "sha256": "793db126d3f299dfc98bd4dd715dfd5183d155557e32ec401491397364da5475"
           }
         ]
       }
     },
     {
-      "repositoryCliVersion": "0.1.131",
+      "repositoryCliVersion": "0.1.136",
       "manifest": {
         "schemaVersion": 1,
-        "bundleVersion": "2.0.121",
+        "bundleVersion": "2.0.126",
         "stepContractVersion": 3,
         "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
         "managedFiles": [
@@ -927,7 +927,7 @@
           },
           {
             "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-            "sha256": "1a8d1f9bf73b24fc07d26b56fa4185fdc9183a45bcf98b9b1996d8e27792bd1e"
+            "sha256": "6a7b8bea3fa6b4245307e96b51872fe04ab576c3a9161314f90c00cf6415465c"
           },
           {
             "path": "docs/funnelsgrove/qa/analytics.md",
@@ -1027,7 +1027,7 @@
           },
           {
             "path": "funnel-docs.config.json",
-            "sha256": "de523557a1057d95aaaf9a535b518fb4d8ca6bd99eaafdd57aab56db17c7cf1e"
+            "sha256": "8b1218c5e5343b2c3e00079170da131aff33f5a808365700f8eab62dbf7433b9"
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/cli",
-  "version": "0.1.140",
+  "version": "0.1.143",
   "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.26",
+    "@funnelsgrove/runtime": "0.7.27",
     "commander": "^12.0.0",
     "typescript": "^5.8.3"
   },
   "devDependencies": {
-    "@funnelsgrove/analytics": "0.1.75",
+    "@funnelsgrove/analytics": "0.1.76",
     "@funnelsgrove/payments": "0.7.19",
     "vitest": "^3.0.0"
   }

package/template_docs/.funnelsgrove-docs.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.130",
+  "bundleVersion": "2.0.133",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
     {
       "path": "AGENTS.md",
-      "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+      "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
     },
     {
       "path": "CLAUDE.md",
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "9988e6f7b4ecf3f4a73ff83cf3f3613f82d765c59d09e55e86b0560d1e3eafa5"
+      "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "4e81bd56071fa38708c7f18488420038339c8cc984062ffd7e8a4930ab6b06f0"
+      "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
     }
   ]
 }

package/template_docs/AGENTS.md

@@ -29,7 +29,7 @@ This file is generated from the FunnelsGrove step contract. Start at [the agent
 
 1. Before edits run `fgrove status`, `git status --short`, and `fgrove github status` when the funnel is GitHub-connected.
 2. Never run `fgrove sync down` over changed synced source. Use `--force` only to intentionally discard those local changes.
-3. Sync-up uses remote compare-and-swap through the base draft version. On stale-draft rejection, download into a clean temporary directory, merge deliberately, rerun checks, and retry.
+3. Sync-up atomically patches changed paths through the base draft version, uploads changed `public/` images directly, and safely replays retries. Disjoint remote edits rebase automatically; on a same-path conflict, run `fgrove sync rebase`, review the merge, rerun checks, and retry.
 4. GitHub-connected changes 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`.
 5. Use `fgrove env pull` when only the ignored `.env` must be refreshed. Environment files never belong in synced source.
 

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.26` first, then `@funnelsgrove/analytics` `0.1.75`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.140`, 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.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.
 <!-- 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.130",
+  "bundleVersion": "2.0.133",
   "contractSource": "funnelsgrove-repository://apps/funnel-runtime/contracts/step-contract-v2.json",
   "fullyGenerated": [
     ".funnelsgrove-docs.json",

package/template_scaffold/.funnelsgrove-docs.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": "2.0.130",
+  "bundleVersion": "2.0.133",
   "stepContractVersion": 3,
   "contractHash": "d761e91d5ac6ff9e72c6d49c5bcd014270912473a66f99c49d726c65998085cf",
   "managedFiles": [
     {
       "path": "AGENTS.md",
-      "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7"
+      "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b"
     },
     {
       "path": "CLAUDE.md",
@@ -38,7 +38,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "9988e6f7b4ecf3f4a73ff83cf3f3613f82d765c59d09e55e86b0560d1e3eafa5"
+      "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829"
     },
     {
       "path": "docs/funnelsgrove/qa/analytics.md",
@@ -138,7 +138,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "4e81bd56071fa38708c7f18488420038339c8cc984062ffd7e8a4930ab6b06f0"
+      "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f"
     }
   ]
 }

package/template_scaffold/.funnelsgrove-scaffold.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 1,
-  "sourceTreeHash": "edcad923cf6088e92c2b736308c60112afdbce89f96376d5d4dac820fc58996f",
+  "sourceTreeHash": "d2169824240f132d22d886aa9be81f9c4148f8166e9e49aa48534713c3dcd032",
   "stepContractVersion": 3,
-  "docsBundleVersion": "2.0.130",
+  "docsBundleVersion": "2.0.133",
   "files": [
     {
       "path": ".env.example",
@@ -16,12 +16,12 @@
     },
     {
       "path": ".funnelsgrove-docs.json",
-      "sha256": "b6b0910ffab65e7d3885aec9eba9fba72e9652e99d3b1e9e08d2253111820172",
+      "sha256": "050e0b96acb57586d7c373bf46598eccea5f409e9f655440a8e0346cdc764523",
       "mode": "100644"
     },
     {
       "path": "AGENTS.md",
-      "sha256": "952fbafb5841b8f2e6fadab5032374c98390ef90c1ca0ed27747a38d0cc009d7",
+      "sha256": "22118f0f909a747f8a27f4eed16ceb5ec2a9283fd9645114fda961c0405a2a6b",
       "mode": "100644"
     },
     {
@@ -101,7 +101,7 @@
     },
     {
       "path": "docs/funnelsgrove/migrations/step-contract-v3.md",
-      "sha256": "9988e6f7b4ecf3f4a73ff83cf3f3613f82d765c59d09e55e86b0560d1e3eafa5",
+      "sha256": "bb6f567146d9c70b209eff612ffcfb5e7c20b7ccb357beec47a187ead887a829",
       "mode": "100644"
     },
     {
@@ -236,7 +236,7 @@
     },
     {
       "path": "funnel-docs.config.json",
-      "sha256": "4e81bd56071fa38708c7f18488420038339c8cc984062ffd7e8a4930ab6b06f0",
+      "sha256": "7a7f556fc144e82469dbc56da7d4ce588c3bcc627ebf4b9aec9961f93d672f1f",
       "mode": "100644"
     },
     {
@@ -256,17 +256,17 @@
     },
     {
       "path": "next.config.ts",
-      "sha256": "cd5ff10c989cf4ae5d54b78638843d56e32e3999f2334cb0cbc9277aae68356c",
+      "sha256": "9d2213c2270579568fa5ae409d5173594c08048bcaf91350b4d946293022ce74",
       "mode": "100644"
     },
     {
       "path": "package-lock.json",
-      "sha256": "09e020ec8442cb7a0a87a1ffddec86d6caee3a54b494ed844407007063ff68a2",
+      "sha256": "8f60d0578889cf9433a5b383f9d243da0f36b22b50bc76354d44c35adf2eba56",
       "mode": "100644"
     },
     {
       "path": "package.json",
-      "sha256": "a965a1abeef3d228a57be9f89275144d9530cafec0d85351cf541fdcc5b8d1ac",
+      "sha256": "931094eb8a5eb373bb956422ec4ba0d50abb25c4525867b22bad6b64ef034318",
       "mode": "100644"
     },
     {

package/template_scaffold/AGENTS.md

@@ -29,7 +29,7 @@ This file is generated from the FunnelsGrove step contract. Start at [the agent
 
 1. Before edits run `fgrove status`, `git status --short`, and `fgrove github status` when the funnel is GitHub-connected.
 2. Never run `fgrove sync down` over changed synced source. Use `--force` only to intentionally discard those local changes.
-3. Sync-up uses remote compare-and-swap through the base draft version. On stale-draft rejection, download into a clean temporary directory, merge deliberately, rerun checks, and retry.
+3. Sync-up atomically patches changed paths through the base draft version, uploads changed `public/` images directly, and safely replays retries. Disjoint remote edits rebase automatically; on a same-path conflict, run `fgrove sync rebase`, review the merge, rerun checks, and retry.
 4. GitHub-connected changes 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`.
 5. Use `fgrove env pull` when only the ignored `.env` must be refreshed. Environment files never belong in synced source.
 

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.26` first, then `@funnelsgrove/analytics` `0.1.75`, then `@funnelsgrove/payments` `0.7.19`. The production deploy verifies the zero-traffic API candidate, publishes and verifies `@funnelsgrove/cli` `0.1.140`, 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.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.
 <!-- 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.130",
+  "bundleVersion": "2.0.133",
   "contractSource": "funnelsgrove-repository://apps/funnel-runtime/contracts/step-contract-v2.json",
   "fullyGenerated": [
     ".funnelsgrove-docs.json",

package/template_scaffold/next.config.ts

@@ -3,6 +3,7 @@ import path from 'node:path';
 import type { NextConfig } from 'next';
 
 const isStaticExportBuild = process.env.NEXT_EXPORT === '1';
+const runtimeConfigOrigin = process.env.FUNNEL_RUNTIME_CONFIG_ORIGIN?.trim().replace(/\/+$/, '') || '';
 
 // Inside the funnelsgrove monorepo, alias @funnelsgrove/* to the package
 // sources so changes there rebuild live. Standalone copies (funnels created
@@ -31,6 +32,12 @@ const nextConfig: NextConfig = {
     ? { output: 'export' as const }
     : {
         rewrites: async () => [
+          ...(runtimeConfigOrigin
+            ? [{
+                source: '/api/funnel-config/:path*',
+                destination: `${runtimeConfigOrigin}/api/funnel-config/:path*`,
+              }]
+            : []),
           {
             source: '/ingest/static/:path*',
             destination: 'https://us-assets.i.posthog.com/static/:path*',

package/template_scaffold/package-lock.json

@@ -8,9 +8,9 @@
       "name": "funnel-template",
       "version": "0.1.0",
       "dependencies": {
-        "@funnelsgrove/analytics": "^0.1.75",
+        "@funnelsgrove/analytics": "^0.1.76",
         "@funnelsgrove/payments": "^0.7.19",
-        "@funnelsgrove/runtime": "^0.7.26",
+        "@funnelsgrove/runtime": "^0.7.27",
         "@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.75",
-      "resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.1.75.tgz",
-      "integrity": "sha512-q7hOSmSuyHQEN/95MBcgjAwWqewUTUlbH3BgaSaYBPabGZyZxMC3Zopmyva/OieXmQ0f3J8JQlpxhdEB7ssftA==",
+      "version": "0.1.76",
+      "resolved": "https://registry.npmjs.org/@funnelsgrove/analytics/-/analytics-0.1.76.tgz",
+      "integrity": "sha512-5Zf0zxZ4GXRpwfHTAcJX1sk07tiFrfC7TVB1dZueyNosFcKl6+o9omVE5/euoJ0uJsblPGTzJDW8+wdyK2MbzA==",
       "dependencies": {
-        "@funnelsgrove/runtime": "0.7.26"
+        "@funnelsgrove/runtime": "0.7.27"
       }
     },
     "node_modules/@funnelsgrove/payments": {
@@ -961,9 +961,9 @@
       }
     },
     "node_modules/@funnelsgrove/runtime": {
-      "version": "0.7.26",
-      "resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.7.26.tgz",
-      "integrity": "sha512-PbdmEC23bJpGo/dRNhhHTbp2y8a/IZ3Ggs3746UwZQOxxzV9ImkNVeWQl0zlmnGvBLWGOWcpTW48nuneR0uwuw==",
+      "version": "0.7.27",
+      "resolved": "https://registry.npmjs.org/@funnelsgrove/runtime/-/runtime-0.7.27.tgz",
+      "integrity": "sha512-FiVI6rmV8BhtRowV46Cm4bqgr2UvYUCI/yyW41lhiYYcnolVxNYyaO++j8FlkqXn99JvPPauSHC6dtLvmojeEg==",
       "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.75",
+    "@funnelsgrove/analytics": "^0.1.76",
     "@funnelsgrove/payments": "^0.7.19",
-    "@funnelsgrove/runtime": "^0.7.26",
+    "@funnelsgrove/runtime": "^0.7.27",
     "@stripe/react-stripe-js": "^5.6.0",
     "@stripe/stripe-js": "^8.7.0",
     "lucide-react": "^0.553.0",