@memberjunction/cli 5.41.0 → 5.42.0

package/dist/commands/migrate/rebake.js

@@ -0,0 +1,193 @@
+import { Command, Flags } from '@oclif/core';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { IncrementalBaker } from '@memberjunction/sql-converter';
+import { MJPostgresTranspiler } from '@memberjunction/sqlglot-ts';
+/**
+ * Re-bake the post-baseline PG migration set with INLINE NATIVE CodeGen (Path C), so the set
+ * deploys with `mj migrate` alone — no `mj codegen` step.
+ *
+ * Unlike `convert --bake-codegen` (which bakes UNCONVERTED migrations forward), `rebake` re-bakes
+ * migrations that already have a committed `.pg.sql`: it advances a live working DB by applying
+ * each migration's known-good committed file in order (which keeps dependent views consistent and
+ * registers new entities), then captures native CodeGen read-only and writes the baked file. A
+ * migration with a transpile gap (unhandled statement / hand-procedural) keeps its committed file.
+ *
+ * Requires a LIVE working PG database (DB_PLATFORM=postgresql + PG_* env, as `mj codegen`) seeded
+ * to the latest baseline; the command brings it forward as it re-bakes.
+ */
+export default class MigrateRebake extends Command {
+    static { this.description = 'Re-bake the post-baseline PG migration set with inline native CodeGen'; }
+    static { this.examples = [
+        '<%= config.bin %> migrate rebake',
+        '<%= config.bin %> migrate rebake --baseline-floor V202605291452 --dry-run',
+    ]; }
+    static { this.flags = {
+        'source-dir': Flags.string({ description: 'Source T-SQL migrations directory', default: './migrations/v5' }),
+        'output-dir': Flags.string({ description: 'PG migrations directory (committed files read here + baked output written here)', default: './migrations-pg/v5' }),
+        schema: Flags.string({ description: 'Target schema name', default: '__mj' }),
+        'baseline-floor': Flags.string({ description: 'Re-bake migrations strictly AFTER this version key (default: the latest B* in output-dir)' }),
+        'dry-run': Flags.boolean({ description: 'Report what would be re-baked without writing files', default: false }),
+    }; }
+    async run() {
+        const { flags } = await this.parse(MigrateRebake);
+        const sourceDir = path.resolve(flags['source-dir']);
+        const outputDir = path.resolve(flags['output-dir']);
+        if (!fs.existsSync(sourceDir))
+            this.error(`Source directory not found: ${sourceDir}`);
+        if (!fs.existsSync(outputDir))
+            this.error(`Output directory not found: ${outputDir}`);
+        const floor = flags['baseline-floor'] ?? this.latestBaselineFloor(outputDir);
+        this.log(`Re-baking migrations after baseline floor: ${floor}`);
+        const migrations = this.postBaselineMigrations(sourceDir, floor);
+        if (migrations.length === 0) {
+            this.log('No post-baseline migrations to re-bake.');
+            return;
+        }
+        this.log(`${migrations.length} post-baseline migration(s) to re-bake.\n`);
+        const transpiler = await this.buildTranspiler(sourceDir);
+        const { baker, dispose } = await this.buildBaker(transpiler, flags.schema);
+        const summary = { baked: [], preserved: [], skipped: [] };
+        try {
+            for (const m of migrations) {
+                const ssSql = fs.readFileSync(path.join(sourceDir, m.source), 'utf8');
+                const committedPath = this.committedCounterpart(outputDir, m.outName, m.source);
+                if (!committedPath) {
+                    this.warn(`${m.source}: no committed PG counterpart in output-dir — skipped (use convert --bake-codegen for new migrations).`);
+                    summary.skipped.push(m.source);
+                    continue;
+                }
+                // mj-sync metadata is owned by `mj sync push`, not CodeGen — preserve it verbatim.
+                if (/Metadata_Sync/i.test(m.source)) {
+                    summary.preserved.push(m.source);
+                    this.log(`  kept    ${m.source}  (metadata-sync — committed preserved)`);
+                    continue;
+                }
+                const committed = fs.readFileSync(committedPath, 'utf8');
+                try {
+                    const result = await baker.bakeMigration(ssSql, m.source, committed);
+                    if (result.mode === 'baked') {
+                        if (!flags['dry-run'])
+                            fs.writeFileSync(committedPath, result.pgSQL);
+                        summary.baked.push(m.source);
+                        this.log(`  baked   ${m.source}  (E(M)=${result.affectedEntities.length})`);
+                    }
+                    else {
+                        summary.preserved.push(m.source); // transpile gap — committed left in place
+                        this.log(`  kept    ${m.source}  (transpile gap — committed preserved)`);
+                    }
+                }
+                catch (err) {
+                    // Advancing or capturing this migration failed (e.g. a committed file that only applies
+                    // under Skyway). Keep the committed file as-is and carry on so one migration can't abort
+                    // the whole re-bake; the working DB simply lacks this migration's (non-schema) change.
+                    summary.preserved.push(m.source);
+                    this.warn(`${m.source}: re-bake failed (${err instanceof Error ? err.message : String(err)}) — committed preserved.`);
+                }
+            }
+        }
+        finally {
+            await dispose();
+        }
+        this.log('\n=== Re-bake Summary ===');
+        this.log(`  baked native:        ${summary.baked.length}`);
+        this.log(`  preserved committed: ${summary.preserved.length}`);
+        this.log(`  skipped (no PG):     ${summary.skipped.length}`);
+        if (flags['dry-run'])
+            this.log('  (dry run — no files written)');
+        this.log('\nDeploy: mj migrate  +  mj sync push   (no mj codegen step)');
+        // setupDataSource opened pg pools that keep the event loop alive; mirror `mj codegen`.
+        process.exit(0);
+    }
+    /** Highest `B<version>__...` baseline in the output dir → its version key is the floor. */
+    latestBaselineFloor(outputDir) {
+        const baselines = fs.readdirSync(outputDir).filter((f) => /^B\d.*\.pg\.sql$/.test(f)).sort();
+        if (baselines.length === 0)
+            this.error('No baseline (B*.pg.sql) found in output-dir; pass --baseline-floor.');
+        return baselines[baselines.length - 1].split('__')[0]; // e.g. "B202605291452" → compared lexically below
+    }
+    /** SS V-migrations whose version key sorts strictly after the floor (committed order). */
+    postBaselineMigrations(sourceDir, floor) {
+        const floorKey = floor.replace(/^B/, 'V'); // baseline keys start with B; migrations with V
+        return fs
+            .readdirSync(sourceDir)
+            .filter((f) => /^V.*\.sql$/.test(f) && !f.endsWith('.pg.sql') && !f.endsWith('.pg-only.sql'))
+            .filter((f) => f.split('__')[0] > floorKey)
+            .sort()
+            .map((source) => ({ source, outName: source.replace(/\.sql$/, '.pg.sql') }));
+    }
+    /** Committed PG counterpart: `.pg.sql` preferred, else a hand-authored `.pg-only.sql`. */
+    committedCounterpart(outputDir, outName, source) {
+        const pg = path.join(outputDir, outName);
+        if (fs.existsSync(pg))
+            return pg;
+        const pgOnly = path.join(outputDir, source.replace(/\.sql$/, '.pg-only.sql'));
+        return fs.existsSync(pgOnly) ? pgOnly : null;
+    }
+    /** AST transpiler with the cross-file BIT-column registry from the baselines (see convert.ts). */
+    async buildTranspiler(sourceDir) {
+        const probe = new MJPostgresTranspiler();
+        try {
+            await probe.preflight();
+        }
+        catch (err) {
+            this.error(err instanceof Error ? err.message : String(err));
+        }
+        const baselines = fs.readdirSync(sourceDir).filter((f) => /^B\d.*\.sql$/.test(f) && !f.endsWith('.pg.sql') && !f.endsWith('.pg-only.sql')).sort();
+        const bitColumns = [];
+        for (const b of baselines) {
+            try {
+                bitColumns.push(...(await probe.collectBitColumns(fs.readFileSync(path.join(sourceDir, b), 'utf8'))));
+            }
+            catch (err) {
+                this.warn(`Bit-column collection failed for ${b}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
+        return new MJPostgresTranspiler({ extraBitColumns: bitColumns });
+    }
+    /**
+     * Wire the working-DB capabilities to a live PG connection. The codegen engine is loaded with a
+     * dynamic import (Rule 8 case 3 — heavy module, opt-in path only); the matching `import type` is
+     * erased at runtime so it does not defeat the deferral.
+     */
+    async buildBaker(transpiler, schema) {
+        const { RunCodeGenBase, SQLCodeGenBase, initializeConfig, dbPlatform } = await import('@memberjunction/codegen-lib');
+        if (dbPlatform() !== 'postgresql') {
+            this.error('migrate rebake requires DB_PLATFORM=postgresql with PG_* connection env (the working DB CodeGen is captured from).');
+        }
+        initializeConfig(process.cwd());
+        let ds;
+        try {
+            ds = await new RunCodeGenBase().setupDataSource();
+        }
+        catch (err) {
+            this.error(`migrate rebake could not connect/load metadata from the working PG database: ${err instanceof Error ? err.message : String(err)}. ` +
+                'Seed the working DB to the latest baseline before re-baking.');
+        }
+        this.log(`  working DB: ${ds.connectionInfo}\n`);
+        const sqlGen = new SQLCodeGenBase();
+        const db = {
+            // Committed files may still carry the `${flyway:defaultSchema}` macro (Skyway substitutes it
+            // at deploy); raw pg.query can't, so substitute before applying to advance the working DB.
+            apply: async (sql) => { await ds.connection.query(sql.replaceAll('${flyway:defaultSchema}', schema)); },
+            refreshMetadata: async () => { await ds.provider.Refresh(); },
+            captureEntity: async (name) => {
+                const entity = ds.provider.EntityByName(name);
+                if (!entity)
+                    throw new Error(`migrate rebake: entity not found in working-DB metadata: ${name}`);
+                const r = await sqlGen.generateSingleEntitySQLToSeparateFiles({
+                    pool: ds.connection,
+                    entity,
+                    directory: os.tmpdir(),
+                    onlyPermissions: false,
+                    writeFiles: false,
+                    skipExecution: true, // READ-ONLY: capture only; the committed file advances the working DB
+                });
+                return { sql: r.sql ?? '', permissionsSQL: r.permissionsSQL ?? '' };
+            },
+        };
+        return { baker: new IncrementalBaker({ transpiler, db, schema }), dispose: async () => { } };
+    }
+}
+//# sourceMappingURL=rebake.js.map

package/dist/commands/migrate/rebake.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebake.js","sourceRoot":"","sources":["../../../src/commands/migrate/rebake.ts"],"names":[],"mappings":"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"}

package/dist/commands/plugin/add.d.ts

@@ -0,0 +1,18 @@
+import { Command } from '@oclif/core';
+/**
+ * Phase 3 convenience: register a third-party CLI plugin by appending its
+ * package specifier to `mj-cli-plugins.json` (created if absent). No MJCLI
+ * changes needed to extend the CLI — add a package, register it here (plan D9).
+ */
+export default class PluginAdd extends Command {
+    static description: string;
+    static examples: string[];
+    static args: {
+        package: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        format: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=add.d.ts.map

package/dist/commands/plugin/add.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/plugin/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,OAAO,EAAS,MAAM,aAAa,CAAC;AAKnD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,OAAO;IAC5C,MAAM,CAAC,WAAW,SAAuF;IAEzG,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,KAAK;;MAEV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAgC3B"}

package/dist/commands/plugin/add.js

@@ -0,0 +1,53 @@
+import { Args, Command, Flags } from '@oclif/core';
+import { PLUGIN_CONFIG_FILENAME } from '@memberjunction/cli-core';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { resolve } from 'path';
+/**
+ * Phase 3 convenience: register a third-party CLI plugin by appending its
+ * package specifier to `mj-cli-plugins.json` (created if absent). No MJCLI
+ * changes needed to extend the CLI — add a package, register it here (plan D9).
+ */
+export default class PluginAdd extends Command {
+    static { this.description = 'Register a CLI plugin package in mj-cli-plugins.json so `mj` loads it at startup.'; }
+    static { this.examples = [
+        `<%= config.bin %> <%= command.id %> @my-org/mj-plugin/plugins`,
+        `<%= config.bin %> <%= command.id %> ./local-plugins/my-tool`,
+    ]; }
+    static { this.args = {
+        package: Args.string({ required: true, description: 'Plugin entry-point specifier (package name, subpath, or relative path)' }),
+    }; }
+    static { this.flags = {
+        format: Flags.string({ options: ['text', 'json'], default: 'text', description: 'Output format' }),
+    }; }
+    async run() {
+        const { args, flags } = await this.parse(PluginAdd);
+        const configPath = resolve(process.cwd(), PLUGIN_CONFIG_FILENAME);
+        // Preserve any other keys (e.g. "$comment") when rewriting.
+        const config = existsSync(configPath)
+            ? JSON.parse(readFileSync(configPath, 'utf-8'))
+            : {};
+        const plugins = Array.isArray(config.plugins) ? config.plugins : [];
+        const alreadyPresent = plugins.includes(args.package);
+        if (!alreadyPresent) {
+            plugins.push(args.package);
+            config.plugins = plugins;
+            writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
+        }
+        const result = {
+            success: true,
+            command: 'plugin:add',
+            durationSeconds: 0,
+            data: { package: args.package, configPath, alreadyPresent, plugins },
+        };
+        if (flags.format === 'json') {
+            this.log(JSON.stringify(result, null, 2));
+        }
+        else if (alreadyPresent) {
+            this.log(`Plugin "${args.package}" is already registered in ${PLUGIN_CONFIG_FILENAME}.`);
+        }
+        else {
+            this.log(`Registered plugin "${args.package}" in ${PLUGIN_CONFIG_FILENAME}.`);
+        }
+    }
+}
+//# sourceMappingURL=add.js.map

package/dist/commands/plugin/add.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/plugin/add.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,OAAO;aACrC,gBAAW,GAAG,mFAAmF,CAAC;aAElG,aAAQ,GAAG;QAChB,+DAA+D;QAC/D,6DAA6D;KAC9D,CAAC;aAEK,SAAI,GAAG;QACZ,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,wEAAwE,EAAE,CAAC;KAChI,CAAC;aAEK,UAAK,GAAG;QACb,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;KACnG,CAAC;IAEF,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,sBAAsB,CAAC,CAAC;QAElE,4DAA4D;QAC5D,MAAM,MAAM,GAA4B,UAAU,CAAC,UAAU,CAAC;YAC5D,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAA6B;YAC5E,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,MAAM,CAAC,OAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;QAElF,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;YACzB,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,MAAM,GAAG;YACb,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,YAAY;YACrB,eAAe,EAAE,CAAC;YAClB,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE;SACrE,CAAC;QAEF,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,cAAc,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,OAAO,8BAA8B,sBAAsB,GAAG,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,OAAO,QAAQ,sBAAsB,GAAG,CAAC,CAAC;QAChF,CAAC;IACH,CAAC"}

package/dist/commands/sync/pull.d.ts

@@ -1,27 +1,7 @@
-import { Command } from '@oclif/core';
-export default class Pull extends Command {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        entity: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        filter: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'multi-file': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'no-validate': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'update-existing': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'create-new': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'backup-before-update': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'merge-strategy': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'backup-directory': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        'preserve-fields': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
-        'exclude-fields': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
-        'target-dir': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        incremental: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        since: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-    };
-    run(): Promise<void>;
-    private findEntityDirectories;
-    private findAllEntityDirectoriesRecursive;
-}
+/**
+ * Thin oclif shim — the real logic lives in {@link SyncPullPlugin} in
+ * `@memberjunction/metadata-sync/plugins` (plan §3). See sync/push.ts for the
+ * shim rationale.
+ */
+export { SyncPullPlugin as default } from '@memberjunction/metadata-sync/plugins';
 //# sourceMappingURL=pull.d.ts.map

package/dist/commands/sync/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAO7C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IACvC,MAAM,CAAC,WAAW,SAAgD;IAElE,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;MA0BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YA8MZ,qBAAqB;IA+BnC,OAAO,CAAC,iCAAiC;CAwB1C"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/pull.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,IAAI,OAAO,EAAE,MAAM,uCAAuC,CAAC"}

package/dist/commands/sync/pull.js

@@ -1,282 +1,7 @@
-import { Command, Flags } from '@oclif/core';
-import { select } from '@inquirer/prompts';
-import ora from 'ora-classic';
-import chalk from 'chalk';
-import fs from 'fs';
-import path from 'path';
-export default class Pull extends Command {
-    static { this.description = 'Pull metadata from database to local files'; }
-    static { this.examples = [
-        `<%= config.bin %> <%= command.id %> --entity="MJ: AI Prompts"`,
-        `<%= config.bin %> <%= command.id %> --entity="MJ: AI Prompts" --filter="CategoryID='customer-service-id'"`,
-        `<%= config.bin %> <%= command.id %> --entity="MJ: AI Agents" --merge-strategy=overwrite`,
-        `<%= config.bin %> <%= command.id %> --entity="Actions" --target-dir=./custom-actions --no-validate`,
-        `<%= config.bin %> <%= command.id %> --entity="Templates" --dry-run --verbose`,
-        `<%= config.bin %> <%= command.id %> --entity="MJ: AI Prompts" --exclude-fields=InternalNotes,DebugInfo`,
-    ]; }
-    static { this.flags = {
-        entity: Flags.string({ description: 'Entity name to pull', required: true }),
-        filter: Flags.string({ description: 'Additional filter for pulling specific records' }),
-        'dry-run': Flags.boolean({ description: 'Show what would be pulled without actually pulling' }),
-        'multi-file': Flags.string({ description: 'Create a single file with multiple records (provide filename)' }),
-        verbose: Flags.boolean({ char: 'v', description: 'Show detailed output' }),
-        'no-validate': Flags.boolean({ description: 'Skip validation before pull' }),
-        'update-existing': Flags.boolean({ description: 'Update existing records during pull', default: true }),
-        'create-new': Flags.boolean({ description: 'Create new files for records not found locally', default: true }),
-        'backup-before-update': Flags.boolean({ description: 'Create backups before updating files', default: true }),
-        'merge-strategy': Flags.string({
-            description: 'Merge strategy for updates',
-            options: ['merge', 'overwrite', 'skip'],
-            default: 'merge'
-        }),
-        'backup-directory': Flags.string({ description: 'Custom backup directory (default: .backups)' }),
-        'preserve-fields': Flags.string({ description: 'Comma-separated list of fields to preserve during updates', multiple: true }),
-        'exclude-fields': Flags.string({ description: 'Comma-separated list of fields to exclude from pull', multiple: true }),
-        'target-dir': Flags.string({ description: 'Specific target directory (overrides auto-discovery)' }),
-        incremental: Flags.boolean({
-            description: 'Only pull records updated since last successful pull',
-            default: false
-        }),
-        since: Flags.string({
-            description: 'Only pull records updated after this ISO 8601 timestamp (e.g., 2026-04-07T10:00:00Z)'
-        }),
-    }; }
-    async run() {
-        const { PullService, ValidationService, FormattingService, loadMJConfig, initializeProvider, getSyncEngine, getSystemUser, resetSyncEngine, configManager, loadEntityConfig, FileBackupManager, } = await import('@memberjunction/metadata-sync');
-        const { flags } = await this.parse(Pull);
-        const spinner = ora();
-        let backupManager = null;
-        try {
-            // Load MJ config first
-            spinner.start('Loading configuration');
-            const mjConfig = loadMJConfig();
-            if (!mjConfig) {
-                this.error('No mj.config.cjs found in current directory or parent directories');
-            }
-            // Stop spinner before provider initialization
-            spinner.stop();
-            // Initialize data provider
-            await initializeProvider(mjConfig);
-            // Get singleton sync engine
-            const syncEngine = await getSyncEngine(getSystemUser());
-            // Show success after initialization
-            if (flags.verbose) {
-                spinner.succeed('Configuration and metadata loaded');
-            }
-            else {
-                spinner.stop();
-            }
-            // Find entity directories
-            const entityDirectories = await this.findEntityDirectories(flags.entity, configManager, loadEntityConfig);
-            if (entityDirectories.length === 0) {
-                this.error(`No directories found for entity "${flags.entity}". Make sure the entity configuration exists in a .mj-sync.json file.`);
-            }
-            // Select target directory
-            let targetDir = flags['target-dir'];
-            if (!targetDir) {
-                if (entityDirectories.length === 1) {
-                    targetDir = entityDirectories[0];
-                }
-                else {
-                    targetDir = await select({
-                        message: `Multiple directories found for entity "${flags.entity}". Which one to use?`,
-                        choices: entityDirectories.map(dir => ({ name: dir, value: dir }))
-                    });
-                }
-            }
-            // Run validation on target directory unless disabled
-            if (!flags['no-validate']) {
-                spinner.start('Validating target directory...');
-                const validator = new ValidationService({ verbose: flags.verbose });
-                const formatter = new FormattingService();
-                const validationResult = await validator.validateDirectory(targetDir);
-                spinner.stop();
-                if (!validationResult.isValid || validationResult.warnings.length > 0) {
-                    // Show validation results
-                    this.log('\n' + formatter.formatValidationResult(validationResult, flags.verbose));
-                    if (!validationResult.isValid) {
-                        // Ask for confirmation
-                        const shouldContinue = await select({
-                            message: 'Validation failed with errors. Do you want to continue anyway?',
-                            choices: [
-                                { name: 'No, fix the errors first', value: false },
-                                { name: 'Yes, continue anyway', value: true }
-                            ],
-                            default: false
-                        });
-                        if (!shouldContinue) {
-                            this.error('Pull cancelled due to validation errors.');
-                        }
-                    }
-                }
-                else {
-                    this.log(chalk.green('✓ Validation passed'));
-                }
-            }
-            // Initialize backup manager if backups are enabled
-            if (flags['backup-before-update']) {
-                backupManager = new FileBackupManager();
-                await backupManager.initialize();
-            }
-            // Create pull service with optional state manager for incremental sync
-            const pullService = new PullService(syncEngine, getSystemUser());
-            if (flags.incremental || flags.since) {
-                const { SyncStateManager } = await import('@memberjunction/metadata-sync');
-                const stateManager = new SyncStateManager(targetDir);
-                await stateManager.load();
-                pullService.setStateManager(stateManager);
-            }
-            // Build pull options - only include CLI flags that were explicitly provided
-            const pullOptions = {
-                entity: flags.entity,
-                targetDir,
-                dryRun: flags['dry-run'],
-                verbose: flags.verbose,
-                noValidate: flags['no-validate']
-            };
-            // Add optional flags only if explicitly provided to avoid overriding entity config
-            if (flags.filter !== undefined)
-                pullOptions.filter = flags.filter;
-            if (flags['multi-file'] !== undefined)
-                pullOptions.multiFile = flags['multi-file'];
-            if (flags['update-existing'] !== undefined)
-                pullOptions.updateExistingRecords = flags['update-existing'];
-            if (flags['create-new'] !== undefined)
-                pullOptions.createNewFileIfNotFound = flags['create-new'];
-            if (flags['backup-before-update'] !== undefined)
-                pullOptions.backupBeforeUpdate = flags['backup-before-update'];
-            if (flags['merge-strategy'] !== undefined)
-                pullOptions.mergeStrategy = flags['merge-strategy'];
-            if (flags['backup-directory'] !== undefined)
-                pullOptions.backupDirectory = flags['backup-directory'];
-            if (flags['preserve-fields'] !== undefined)
-                pullOptions.preserveFields = flags['preserve-fields'];
-            if (flags['exclude-fields'] !== undefined)
-                pullOptions.excludeFields = flags['exclude-fields'];
-            if (flags.incremental)
-                pullOptions.incremental = flags.incremental;
-            if (flags.since !== undefined)
-                pullOptions.since = flags.since;
-            await pullService.pull(pullOptions, {
-                onProgress: (message) => {
-                    spinner.start(message);
-                },
-                onSuccess: (message) => {
-                    spinner.succeed(message);
-                },
-                onError: (message) => {
-                    spinner.fail(message);
-                },
-                onWarn: (message) => {
-                    this.warn(message);
-                },
-                onLog: (message) => {
-                    this.log(message);
-                }
-            });
-            // Clean up backups on success
-            if (backupManager && !flags['dry-run']) {
-                await backupManager.cleanup();
-                if (flags.verbose) {
-                    this.log(chalk.green('✓ Temporary backup files cleaned up'));
-                }
-            }
-            // Clean up persistent backup files created by PullService
-            if (!flags['dry-run']) {
-                try {
-                    const backupCount = pullService.getCreatedBackupFiles().length;
-                    await pullService.cleanupBackupFiles();
-                    if (flags.verbose && backupCount > 0) {
-                        this.log(chalk.green(`✓ Cleaned up ${backupCount} persistent backup files`));
-                    }
-                }
-                catch (cleanupError) {
-                    this.warn(`Failed to cleanup persistent backup files: ${cleanupError}`);
-                }
-            }
-            if (!flags['dry-run']) {
-                this.log(`\n✅ Pull completed successfully`);
-            }
-        }
-        catch (error) {
-            spinner.fail('Pull failed');
-            // Rollback backups on error
-            if (backupManager) {
-                try {
-                    await backupManager.rollback();
-                    if (flags.verbose) {
-                        this.log(chalk.yellow('↩️  Backup files restored'));
-                    }
-                }
-                catch (rollbackError) {
-                    this.warn(`Failed to rollback backup files: ${rollbackError}`);
-                }
-            }
-            // Enhanced error logging
-            this.log('\n=== Pull Error Details ===');
-            this.log(`Error type: ${error?.constructor?.name || 'Unknown'}`);
-            this.log(`Error message: ${error instanceof Error ? error.message : String(error)}`);
-            if (error instanceof Error && error.stack) {
-                this.log(`\nStack trace:`);
-                this.log(error.stack);
-            }
-            // Context information
-            this.log(`\nContext:`);
-            this.log(`- Working directory: ${process.cwd()}`);
-            this.log(`- Entity: ${flags.entity || 'not specified'}`);
-            this.log(`- Filter: ${flags.filter || 'none'}`);
-            this.error(error);
-        }
-        finally {
-            // Reset singletons
-            resetSyncEngine();
-        }
-    }
-    async findEntityDirectories(entityName, configMgr, loadConfig) {
-        try {
-            const workingDir = configMgr.getOriginalCwd();
-            // Search recursively for all directories with .mj-sync.json files
-            const allDirs = this.findAllEntityDirectoriesRecursive(workingDir);
-            // Filter directories that match the requested entity
-            const entityDirs = [];
-            for (const dir of allDirs) {
-                try {
-                    const config = await loadConfig(dir);
-                    if (config && config.entity === entityName) {
-                        entityDirs.push(dir);
-                    }
-                }
-                catch (error) {
-                    this.warn(`Skipping directory ${dir}: invalid configuration (${error})`);
-                }
-            }
-            return entityDirs;
-        }
-        catch (error) {
-            this.error(`Failed to find entity directories: ${error}`);
-        }
-    }
-    findAllEntityDirectoriesRecursive(dir) {
-        const directories = [];
-        try {
-            // Check if current directory has .mj-sync.json
-            const syncConfigPath = path.join(dir, '.mj-sync.json');
-            if (fs.existsSync(syncConfigPath)) {
-                directories.push(dir);
-            }
-            // Recursively search subdirectories
-            const items = fs.readdirSync(dir, { withFileTypes: true });
-            for (const item of items) {
-                if (item.isDirectory() && !item.name.startsWith('.')) {
-                    const subdirPath = path.join(dir, item.name);
-                    directories.push(...this.findAllEntityDirectoriesRecursive(subdirPath));
-                }
-            }
-        }
-        catch (error) {
-            // Skip directories we can't read
-        }
-        return directories;
-    }
-}
+/**
+ * Thin oclif shim — the real logic lives in {@link SyncPullPlugin} in
+ * `@memberjunction/metadata-sync/plugins` (plan §3). See sync/push.ts for the
+ * shim rationale.
+ */
+export { SyncPullPlugin as default } from '@memberjunction/metadata-sync/plugins';
 //# sourceMappingURL=pull.js.map