@funnelsgrove/cli 0.1.1 → 0.1.3

package/README.md

@@ -4,24 +4,24 @@ Install:
 
 ```bash
 npm install -g @funnelsgrove/cli
-fg login
+fgrove login
 ```
 
 Set the active project and funnel:
 
 ```bash
-fg use --project claimbee --funnel claimbee-ios
-fg status
+fgrove use --project claimbee --funnel claimbee-ios
+fgrove status
 ```
 
 Common workflow:
 
 ```bash
-fg sync down --dir ./claimbee-ios
+fgrove sync down --dir ./claimbee-ios
 cd ./claimbee-ios
-fg docs
-fg sync up --message 'Update funnel copy'
-fg publish --env preview
+fgrove docs
+fgrove sync up --message 'Update funnel copy'
+fgrove publish --env preview
 ```
 
 The package also keeps the longer `funnelsgrove` command as a compatibility alias.

package/dist/apiClient.js

@@ -46,6 +46,16 @@ export async function callTrpcProcedure(input) {
         ? `${baseUrl}?input=${encodeURIComponent(JSON.stringify(input.input))}`
         : baseUrl;
     const response = await fetchFn(url, init);
-    const json = await response.json();
+    const responseText = await response.text();
+    let json;
+    try {
+        json = JSON.parse(responseText);
+    }
+    catch {
+        const contentType = response.headers.get('content-type') || 'unknown content type';
+        const snippet = responseText.replace(/\s+/g, ' ').trim().slice(0, 500);
+        const details = snippet ? `: ${snippet}` : '';
+        throw new Error(`FunnelsGrove API returned ${response.status} ${response.statusText || 'Unknown status'} with ${contentType}${details}`);
+    }
     return parseTrpcJsonResponse(json);
 }

package/dist/cli.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { readFileSync } from 'node:fs';
 import { cp, mkdir, readFile, writeFile } from 'node:fs/promises';
 import { createInterface } from 'node:readline/promises';
 import path from 'node:path';
@@ -6,10 +7,22 @@ import { fileURLToPath } from 'node:url';
 import { Command } from 'commander';
 import { callTrpcProcedure } from './apiClient.js';
 import { clearActiveContext, getDefaultAuthConfigPath, loadActiveContext, loadAuthToken, saveActiveContext, saveAuthToken, } from './authStore.js';
-import { buildSyncManifest, collectSourceFiles, readSyncManifest, writeSourceFiles, writeSyncManifest, } from './localSync.js';
+import { buildSyncManifest, chunkChangedSourceFiles, collectChangedSourceFiles, collectSourceFiles, readSyncManifest, writeSourceFiles, writeSyncManifest, } from './localSync.js';
 import { isKnownTemplate, KNOWN_TEMPLATE_SLUGS, reskinFunnel } from './reskin.js';
 import { syncTemplateDocs, TEMPLATE_DOCS_DIR } from './templateDocs.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const readCliVersion = () => {
+    try {
+        const packageJson = JSON.parse(readFileSync(path.resolve(__dirname, '..', 'package.json'), 'utf8'));
+        if (typeof packageJson.version === 'string' && packageJson.version.trim()) {
+            return packageJson.version;
+        }
+    }
+    catch {
+        // Fall through to the packaged fallback below.
+    }
+    return '0.1.3';
+};
 const toKebabCase = (value) => value
     .trim()
     .replace(/([a-z])([A-Z])/g, '$1-$2')
@@ -30,7 +43,7 @@ const getConfigPath = () => {
 const readAuthToken = async () => {
     const token = await loadAuthToken(getConfigPath());
     if (!token) {
-        throw new Error('Not logged in. Run `fg login` first.');
+        throw new Error('Not logged in. Run `fgrove login` first.');
     }
     return token;
 };
@@ -173,7 +186,7 @@ const resolveSyncTarget = async (input) => {
         ? await resolveFunnelId(input.token, workspaceId, input.funnel)
         : manifest?.funnelId || active?.funnelId;
     if (!funnelId) {
-        throw new Error('No active funnel. Run `fg use --funnel <id-or-slug>` or pass `--funnel`.');
+        throw new Error('No active funnel. Run `fgrove use --funnel <id-or-slug>` or pass `--funnel`.');
     }
     return {
         workspaceId,
@@ -203,23 +216,23 @@ const printRows = (rows, columns) => {
 const addExamples = (command, examples) => command.addHelpText('after', `\nExamples:\n${examples.map((example) => `  $ ${example}`).join('\n')}`);
 const program = new Command();
 program
-    .name('fg')
+    .name('fgrove')
     .description('FunnelsGrove CLI for editing, syncing, and publishing funnels')
-    .version('0.1.0')
+    .version(readCliVersion())
     .option('--api-url <url>', 'FunnelsGrove tRPC API URL', process.env.FUNNELSGROVE_API_URL || DEFAULT_API_URL)
     .option('--config <path>', 'Auth config path', process.env.FUNNELSGROVE_CONFIG || getDefaultAuthConfigPath());
 addExamples(program, [
-    'fg login',
-    'fg use --project claimbee --funnel claimbee-ios',
-    'fg sync down --dir ./claimbee-ios',
-    'fg publish --env preview',
+    'fgrove login',
+    'fgrove use --project claimbee --funnel claimbee-ios',
+    'fgrove sync down --dir ./claimbee-ios',
+    'fgrove publish --env preview',
 ]);
 addExamples(program
     .command('login')
     .description('Authorize this CLI with your FunnelsGrove account')
     .option('--code <code>', '8 digit code from the authorization page'), [
-    'fg login',
-    'fg login --api-url http://localhost:3001/trpc',
+    'fgrove login',
+    'fgrove login --api-url http://localhost:3001/trpc',
 ])
     .action(async (options) => {
     const request = await callApi({
@@ -244,7 +257,7 @@ addExamples(program
 addExamples(program
     .command('whoami')
     .description('Show the current authenticated user'), [
-    'fg whoami',
+    'fgrove whoami',
 ])
     .action(async () => {
     const token = await readAuthToken();
@@ -258,9 +271,9 @@ addExamples(program
     .option('--project <id-or-slug-or-name>', 'Project id, slug, or name')
     .option('--funnel <id-or-slug-or-name>', 'Funnel id, slug, or name')
     .option('--clear', 'Clear the active CLI context'), [
-    'fg use --project claimbee --funnel claimbee-ios',
-    'fg use --workspace acme --project claimbee',
-    'fg use --clear',
+    'fgrove use --project claimbee --funnel claimbee-ios',
+    'fgrove use --workspace acme --project claimbee',
+    'fgrove use --clear',
 ])
     .action(async (options) => {
     if (options.clear) {
@@ -292,8 +305,8 @@ addExamples(program
     .command('status')
     .description('Show the authenticated user and active CLI context')
     .option('--dir <path>', 'Local source directory for reading sync manifest', '.'), [
-    'fg status',
-    'fg status --dir ./claimbee-ios',
+    'fgrove status',
+    'fgrove status --dir ./claimbee-ios',
 ])
     .action(async (options) => {
     const token = await readAuthToken();
@@ -315,15 +328,15 @@ addExamples(program
     }
 });
 const projectsCommand = addExamples(program.command('projects').description('Manage projects'), [
-    'fg projects list',
-    'fg projects list --workspace acme',
+    'fgrove projects list',
+    'fgrove projects list --workspace acme',
 ]);
 addExamples(projectsCommand
     .command('list')
     .description('List projects in the active or provided workspace')
     .option('--workspace <id-or-slug-or-name>', 'Workspace id, slug, or name'), [
-    'fg projects list',
-    'fg projects list --workspace acme',
+    'fgrove projects list',
+    'fgrove projects list --workspace acme',
 ])
     .action(async (options) => {
     const token = await readAuthToken();
@@ -332,15 +345,15 @@ addExamples(projectsCommand
     printRows(projects, ['id', 'name', 'slug']);
 });
 const funnelsCommand = addExamples(program.command('funnels').description('Manage funnels'), [
-    'fg funnels list',
-    'fg funnels clone --funnel claimbee --name claimbee-ios',
+    'fgrove funnels list',
+    'fgrove funnels clone --funnel claimbee --name claimbee-ios',
 ]);
 addExamples(funnelsCommand
     .command('list')
     .description('List funnels in a workspace')
     .option('--workspace <id-or-slug-or-name>', 'Workspace id, slug, or name'), [
-    'fg funnels list',
-    'fg funnels list --workspace acme',
+    'fgrove funnels list',
+    'fgrove funnels list --workspace acme',
 ])
     .action(async (options) => {
     const token = await readAuthToken();
@@ -354,8 +367,8 @@ addExamples(funnelsCommand
     .option('--workspace <id-or-slug-or-name>', 'Workspace id, slug, or name')
     .requiredOption('--funnel <id-or-slug>', 'Source funnel id or slug')
     .requiredOption('--name <name>', 'New funnel name'), [
-    'fg funnels clone --funnel claimbee --name claimbee-ios',
-    'fg funnels clone --workspace acme --funnel claimbee --name claimbee-ios',
+    'fgrove funnels clone --funnel claimbee --name claimbee-ios',
+    'fgrove funnels clone --workspace acme --funnel claimbee --name claimbee-ios',
 ])
     .action(async (options) => {
     const token = await readAuthToken();
@@ -374,8 +387,8 @@ addExamples(funnelsCommand
     console.log(`${result.funnel.id}\t${result.funnel.name}\t${result.funnel.slug}`);
 });
 const syncCommand = addExamples(program.command('sync').description('Sync funnel source'), [
-    'fg sync down --dir ./claimbee-ios',
-    'fg sync up --message "Update copy"',
+    'fgrove sync down --dir ./claimbee-ios',
+    'fgrove sync up --message "Update copy"',
 ]);
 addExamples(syncCommand
     .command('down')
@@ -383,8 +396,8 @@ addExamples(syncCommand
     .option('--workspace <id-or-slug-or-name>', 'Workspace id, slug, or name')
     .option('--funnel <id-or-slug>', 'Funnel id or slug')
     .requiredOption('--dir <path>', 'Local target directory'), [
-    'fg sync down --dir ./claimbee-ios',
-    'fg sync down --funnel claimbee-ios --dir ./claimbee-ios',
+    'fgrove sync down --dir ./claimbee-ios',
+    'fgrove sync down --funnel claimbee-ios --dir ./claimbee-ios',
 ])
     .action(async (options) => {
     const token = await readAuthToken();
@@ -423,8 +436,8 @@ addExamples(syncCommand
     .option('--funnel <id-or-slug>', 'Funnel id or slug')
     .option('--dir <path>', 'Local source directory', '.')
     .option('--message <message>', 'Draft version message'), [
-    'fg sync up --message "Update hero copy"',
-    'fg sync up --dir ./claimbee-ios --message "Update paywall"',
+    'fgrove sync up --message "Update hero copy"',
+    'fgrove sync up --dir ./claimbee-ios --message "Update paywall"',
 ])
     .action(async (options) => {
     const token = await readAuthToken();
@@ -434,24 +447,60 @@ addExamples(syncCommand
         funnel: options.funnel,
         dir: options.dir,
     });
-    const files = await collectSourceFiles(target.sourceDir);
-    const result = await callApi({
-        path: 'funnels.importSource',
-        type: 'mutation',
-        token,
-        data: {
-            workspaceId: target.workspaceId,
-            funnelId: target.funnelId,
-            message: options.message,
-            files,
-        },
-    });
+    const changes = target.manifest
+        ? await collectChangedSourceFiles(target.sourceDir, target.manifest)
+        : null;
+    if (changes && changes.files.length === 0 && changes.deletedPaths.length === 0) {
+        console.log('No local changes to sync.');
+        return;
+    }
+    let result = null;
+    let syncedFileCount = 0;
+    let deletedFileCount = 0;
+    if (changes) {
+        const batches = chunkChangedSourceFiles(changes);
+        for (const batch of batches) {
+            result = await callApi({
+                path: 'funnels.patchSource',
+                type: 'mutation',
+                token,
+                data: {
+                    workspaceId: target.workspaceId,
+                    funnelId: target.funnelId,
+                    message: options.message,
+                    files: batch.files,
+                    deletedPaths: batch.deletedPaths,
+                },
+            });
+            syncedFileCount += result.syncedFiles.length;
+            deletedFileCount += result.deletedFiles?.length || 0;
+        }
+    }
+    else {
+        result = await callApi({
+            path: 'funnels.importSource',
+            type: 'mutation',
+            token,
+            data: {
+                workspaceId: target.workspaceId,
+                funnelId: target.funnelId,
+                message: options.message,
+                files: await collectSourceFiles(target.sourceDir),
+            },
+        });
+        syncedFileCount = result.syncedFiles.length;
+        deletedFileCount = result.deletedFiles?.length || 0;
+    }
+    if (!result) {
+        throw new Error('No sync result returned.');
+    }
     await writeSyncManifest(target.sourceDir, await buildSyncManifest(target.sourceDir, {
         workspaceId: target.workspaceId,
         funnelId: target.funnelId,
         draftVersionId: result.versionId,
     }));
-    console.log(`Synced ${result.syncedFiles.length} files to draft v${result.versionSeq} (${result.versionId})`);
+    const deletedSummary = deletedFileCount > 0 ? ` and removed ${deletedFileCount} files` : '';
+    console.log(`Synced ${syncedFileCount} files${deletedSummary} to draft v${result.versionSeq} (${result.versionId})`);
 });
 addExamples(program
     .command('publish')
@@ -462,8 +511,8 @@ addExamples(program
     .option('--env <preview-or-production>', 'Publish environment', 'preview')
     .option('--domain <domain>', 'Production custom domain')
     .option('--message <message>', 'Publish version message'), [
-    'fg publish --env preview --message "Preview copy updates"',
-    'fg publish --env production --domain claimbee.example.com --message "Launch"',
+    'fgrove publish --env preview --message "Preview copy updates"',
+    'fgrove publish --env production --domain claimbee.example.com --message "Launch"',
 ])
     .action(async (options) => {
     const token = await readAuthToken();
@@ -497,8 +546,8 @@ addExamples(program
     .command('docs')
     .description('Install or refresh local funnel editing docs in a funnel directory')
     .option('--dir <path>', 'Local funnel directory', '.'), [
-    'fg docs',
-    'fg docs --dir ./claimbee-ios',
+    'fgrove docs',
+    'fgrove docs --dir ./claimbee-ios',
 ])
     .action(async (options) => {
     const targetDir = path.resolve(process.cwd(), options.dir);
@@ -511,8 +560,8 @@ addExamples(program
     .requiredOption('--from <template>', 'Template slug from rag-catalog')
     .requiredOption('--app <name>', 'Your app name')
     .option('--output <dir>', 'Output directory'), [
-    'fg create --from headway-funnel --app ClaimBee',
-    'fg create --from promova --app ClaimBee --output ./claimbee-funnel',
+    'fgrove create --from headway-funnel --app ClaimBee',
+    'fgrove create --from promova --app ClaimBee --output ./claimbee-funnel',
 ])
     .action(async (options) => {
     const { from: templateSlug, app: appName, output } = options;

package/dist/localSync.d.ts

@@ -16,10 +16,22 @@ export type SourceFile = {
     content: string;
     contentType?: string;
 };
+export type ChangedSourceFiles = {
+    currentManifest: SyncManifest;
+    deletedPaths: string[];
+    files: SourceFile[];
+};
+export type SourceFilePatchBatch = {
+    deletedPaths: string[];
+    files: SourceFile[];
+};
+export declare const DEFAULT_PATCH_BATCH_CONTENT_CHARS = 12000000;
 export declare function normalizeSyncPath(filePath: string): string;
 export declare function shouldSyncFile(filePath: string): boolean;
 export declare function buildSyncManifest(rootDir: string, input: SyncManifestInput): Promise<SyncManifest>;
 export declare function writeSyncManifest(rootDir: string, manifest: SyncManifest): Promise<void>;
 export declare function readSyncManifest(rootDir: string): Promise<SyncManifest | null>;
 export declare function collectSourceFiles(rootDir: string): Promise<SourceFile[]>;
+export declare function collectChangedSourceFiles(rootDir: string, previousManifest: SyncManifest): Promise<ChangedSourceFiles>;
+export declare function chunkChangedSourceFiles(changes: Pick<ChangedSourceFiles, 'deletedPaths' | 'files'>, maxContentChars?: number): SourceFilePatchBatch[];
 export declare function writeSourceFiles(rootDir: string, files: SourceFile[]): Promise<void>;

package/dist/localSync.js

@@ -2,6 +2,7 @@ import { createHash } from 'node:crypto';
 import { mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 export const SYNC_MANIFEST_FILE = '.funnelsgrove-sync.json';
+export const DEFAULT_PATCH_BATCH_CONTENT_CHARS = 12_000_000;
 const EXCLUDED_PATH_PARTS = new Set(['node_modules', '.next', 'out']);
 export function normalizeSyncPath(filePath) {
     const normalized = path.posix.normalize(filePath.replaceAll('\\', '/'));
@@ -76,7 +77,58 @@ export async function collectSourceFiles(rootDir) {
         funnelId: '',
         draftVersionId: '',
     });
-    const files = await Promise.all(manifest.files.map(async (file) => {
+    return readSourceFiles(rootDir, manifest.files);
+}
+export async function collectChangedSourceFiles(rootDir, previousManifest) {
+    const currentManifest = await buildSyncManifest(rootDir, {
+        workspaceId: previousManifest.workspaceId,
+        funnelId: previousManifest.funnelId,
+        draftVersionId: previousManifest.draftVersionId,
+    });
+    const previousHashByPath = new Map(previousManifest.files.map((file) => [file.path, file.hash]));
+    const currentHashByPath = new Map(currentManifest.files.map((file) => [file.path, file.hash]));
+    const changedManifestFiles = currentManifest.files.filter((file) => previousHashByPath.get(file.path) !== file.hash);
+    const deletedPaths = previousManifest.files
+        .filter((file) => !currentHashByPath.has(file.path))
+        .map((file) => file.path)
+        .sort((left, right) => left.localeCompare(right));
+    return {
+        currentManifest,
+        deletedPaths,
+        files: await readSourceFiles(rootDir, changedManifestFiles),
+    };
+}
+export function chunkChangedSourceFiles(changes, maxContentChars = DEFAULT_PATCH_BATCH_CONTENT_CHARS) {
+    const batches = [];
+    let currentBatch = {
+        deletedPaths: changes.deletedPaths,
+        files: [],
+    };
+    let currentContentChars = 0;
+    const pushCurrentBatch = () => {
+        if (currentBatch.files.length === 0 && currentBatch.deletedPaths.length === 0) {
+            return;
+        }
+        batches.push(currentBatch);
+        currentBatch = {
+            deletedPaths: [],
+            files: [],
+        };
+        currentContentChars = 0;
+    };
+    for (const file of changes.files) {
+        if (currentBatch.files.length > 0 &&
+            currentContentChars + file.content.length > maxContentChars) {
+            pushCurrentBatch();
+        }
+        currentBatch.files.push(file);
+        currentContentChars += file.content.length;
+    }
+    pushCurrentBatch();
+    return batches;
+}
+async function readSourceFiles(rootDir, manifestFiles) {
+    const files = await Promise.all(manifestFiles.map(async (file) => {
         const absolutePath = path.join(rootDir, assertSafeSyncPath(file.path));
         const imageContentType = inferImageContentType(file.path);
         const buffer = await readFile(absolutePath);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@funnelsgrove/cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "FunnelsGrove command-line tools for editing, syncing, and publishing funnels",
   "type": "module",
   "bin": {
-    "fg": "dist/cli.js",
+    "fgrove": "dist/cli.js",
     "funnelsgrove": "dist/cli.js"
   },
   "files": [
@@ -16,7 +16,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "rm -rf dist && tsc",
+    "build": "rm -rf dist && tsc && chmod +x dist/cli.js",
     "prepack": "npm run build",
     "test": "vitest run"
   },

package/template_docs/agent.md

@@ -4,11 +4,11 @@ Use this folder as the local source-of-truth guide when editing a synced Funnels
 
 ## Workflow
 
-1. Run `fg status` and confirm the active project and funnel.
+1. Run `fgrove status` and confirm the active project and funnel.
 2. Keep edits inside the synced funnel tree.
 3. Run the funnel's local checks before syncing.
-4. Run `fg sync up --message '<summary>'`.
-5. Run `fg publish --env preview --message '<summary>'` and verify the preview.
+4. Run `fgrove sync up --message '<summary>'`.
+5. Run `fgrove publish --env preview --message '<summary>'` and verify the preview.
 6. Publish production only when explicitly requested.
 
 ## Topics