@funnelsgrove/cli 0.1.8 → 0.1.10

package/README.md

@@ -7,24 +7,25 @@ npm install -g @funnelsgrove/cli
 fgrove login
 ```
 
-Set the active project and funnel:
+Sync a funnel into its own local folder:
 
 ```bash
-fgrove use --project claimbee --funnel claimbee-ios
-fgrove status
+fgrove sync down --funnel claimbee-ios --dir ./claimbee-ios
+cd ./claimbee-ios
 ```
 
 Common workflow:
 
 ```bash
-fgrove sync down --dir ./claimbee-ios
-cd ./claimbee-ios
+fgrove status
 fgrove docs
 fgrove sync up --message 'Update funnel copy'
 fgrove publish --env preview
 ```
 
-Use `fgrove env pull --dir <local-dir>` to refresh only the ignored local `.env` file after project settings change, without replacing source files.
+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.
+
+Use `fgrove env pull` from a synced folder to refresh only the ignored local `.env` file after project settings change, without replacing source files.
 
 GitHub sync workflow:
 

package/dist/cli.d.ts

@@ -1,2 +1,16 @@
 #!/usr/bin/env node
+import { type ActiveContext } from './authStore.js';
+import { type SyncManifest } from './localSync.js';
+type SyncTargetIdInput = {
+    explicitWorkspaceId?: string;
+    explicitFunnelId?: string;
+    manifest?: Pick<SyncManifest, 'workspaceId' | 'funnelId'> | null;
+    active?: Pick<ActiveContext, 'workspaceId' | 'funnelId'> | null;
+    defaultWorkspaceId?: string;
+};
+export declare function resolveSyncTargetIds(input: SyncTargetIdInput): {
+    workspaceId: string;
+    funnelId?: string;
+};
+export declare function isCliEntrypoint(invokedPath: string | undefined, modulePath: string, realpath?: (filePath: string) => string): boolean;
 export {};

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { readFileSync } from 'node:fs';
+import { readFileSync, realpathSync } from 'node:fs';
 import { cp, mkdir } from 'node:fs/promises';
 import { createInterface } from 'node:readline/promises';
 import path from 'node:path';
@@ -37,6 +37,30 @@ const DEFAULT_API_URL = 'https://api.funnelsgrove.com/trpc';
 const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const PUBLISH_POLL_INTERVAL_MS = 2_000;
 const PUBLISH_WAIT_TIMEOUT_MS = 30 * 60_000;
+export function resolveSyncTargetIds(input) {
+    const workspaceId = input.explicitWorkspaceId ||
+        input.manifest?.workspaceId ||
+        input.active?.workspaceId ||
+        input.defaultWorkspaceId;
+    if (!workspaceId) {
+        throw new Error('No workspace found for this account.');
+    }
+    return {
+        workspaceId,
+        funnelId: input.explicitFunnelId || input.manifest?.funnelId || input.active?.funnelId,
+    };
+}
+export function isCliEntrypoint(invokedPath, modulePath, realpath = realpathSync) {
+    if (!invokedPath) {
+        return false;
+    }
+    try {
+        return realpath(path.resolve(invokedPath)) === realpath(modulePath);
+    }
+    catch {
+        return path.resolve(invokedPath) === path.resolve(modulePath);
+    }
+}
 const getApiUrl = () => {
     const options = program.opts();
     return options.apiUrl || process.env.FUNNELSGROVE_API_URL || DEFAULT_API_URL;
@@ -218,18 +242,24 @@ const resolveSyncTarget = async (input) => {
     const sourceDir = path.resolve(process.cwd(), input.dir || '.');
     const manifest = await readSyncManifest(sourceDir);
     const active = await loadActiveContext(getConfigPath());
-    const workspaceId = input.workspace
-        ? await resolveWorkspaceId(input.token, input.workspace)
-        : manifest?.workspaceId || active?.workspaceId || await resolveWorkspaceId(input.token);
-    const funnelId = input.funnel
-        ? await resolveFunnelId(input.token, workspaceId, input.funnel)
-        : manifest?.funnelId || active?.funnelId;
-    if (!funnelId) {
-        throw new Error('No active funnel. Run `fgrove use --funnel <id-or-slug>` or pass `--funnel`.');
+    const explicitWorkspaceId = input.workspace ? await resolveWorkspaceId(input.token, input.workspace) : undefined;
+    const fallbackWorkspaceId = explicitWorkspaceId || manifest?.workspaceId || active?.workspaceId || await resolveWorkspaceId(input.token);
+    const explicitFunnelId = input.funnel
+        ? await resolveFunnelId(input.token, fallbackWorkspaceId, input.funnel)
+        : undefined;
+    const resolved = resolveSyncTargetIds({
+        explicitWorkspaceId,
+        explicitFunnelId,
+        manifest,
+        active,
+        defaultWorkspaceId: fallbackWorkspaceId,
+    });
+    if (!resolved.funnelId) {
+        throw new Error('No synced funnel found. Run from a synced funnel directory, pass `--funnel`, or set a fallback with `fgrove use --funnel <id-or-slug>`.');
     }
     return {
-        workspaceId,
-        funnelId,
+        workspaceId: resolved.workspaceId,
+        funnelId: resolved.funnelId,
         sourceDir,
         manifest,
     };
@@ -277,8 +307,8 @@ program
     .option('--config <path>', 'Auth config path', process.env.FUNNELSGROVE_CONFIG || getDefaultAuthConfigPath());
 addExamples(program, [
     'fgrove login',
-    'fgrove use --project claimbee --funnel claimbee-ios',
-    'fgrove sync down --dir ./claimbee-ios',
+    'fgrove sync down --funnel claimbee-ios --dir ./claimbee-ios',
+    'cd ./claimbee-ios && fgrove status',
     'fgrove publish --env preview',
 ]);
 addExamples(program
@@ -372,9 +402,9 @@ addExamples(program
     console.log(`user\t${me.user.email || me.user.id}`);
     console.log(`api\t${getApiUrl()}`);
     console.log(`config\t${getConfigPath()}`);
-    console.log(`workspace\t${active?.workspaceName || active?.workspaceSlug || active?.workspaceId || me.workspace?.name || 'Not set'}`);
-    console.log(`project\t${active?.projectName || active?.projectSlug || active?.projectId || 'Not set'}`);
-    console.log(`funnel\t${active?.funnelName || active?.funnelSlug || active?.funnelId || 'Not set'}`);
+    console.log(`workspace\t${manifest?.workspaceId || active?.workspaceName || active?.workspaceSlug || active?.workspaceId || me.workspace?.name || 'Not set'}`);
+    console.log(`project\t${manifest ? 'Not set' : active?.projectName || active?.projectSlug || active?.projectId || 'Not set'}`);
+    console.log(`funnel\t${manifest?.funnelId || active?.funnelName || active?.funnelSlug || active?.funnelId || 'Not set'}`);
     if (manifest) {
         console.log(`localWorkspace\t${manifest.workspaceId}`);
         console.log(`localFunnel\t${manifest.funnelId}`);
@@ -441,7 +471,7 @@ 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'), [
-    'fgrove sync down --dir ./claimbee-ios',
+    'fgrove sync down --funnel claimbee-ios --dir ./claimbee-ios',
     'fgrove sync up --message "Update copy"',
 ]);
 addExamples(syncCommand
@@ -450,7 +480,6 @@ 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'), [
-    'fgrove sync down --dir ./claimbee-ios',
     'fgrove sync down --funnel claimbee-ios --dir ./claimbee-ios',
 ])
     .action(async (options) => {
@@ -827,7 +856,9 @@ addExamples(program
     console.log('  npm install');
     console.log('  npm run dev');
 });
-program.parseAsync().catch((error) => {
-    console.error(error instanceof Error ? error.message : String(error));
-    process.exitCode = 1;
-});
+if (isCliEntrypoint(process.argv[1], fileURLToPath(import.meta.url))) {
+    program.parseAsync().catch((error) => {
+        console.error(error instanceof Error ? error.message : String(error));
+        process.exitCode = 1;
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/cli",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "FunnelsGrove command-line tools for editing, syncing, and publishing funnels",
   "type": "module",
   "bin": {