@loopress/cli 0.28.0 → 0.29.0

package/dist/commands/push.js

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { LoopressCommand } from '../lib/base.js';
 import { guardProductionPush } from '../lib/guard-production-push.js';
 import { stdoutToStderr } from '../lib/json-delegation.js';
+import { isLocalEnvironment } from '../lib/wp-client.js';
 import { wpackagistRequire } from '../utils/composer.js';
 import { pluralize } from '../utils/pluralize.js';
 // Dependency-ish order: code first (plugins, composer), then the ACF definitions content
@@ -16,7 +17,7 @@ const PUSH_TARGETS = [
     { commandId: 'hook:push', label: 'hooks' },
     { commandId: 'form:push', label: 'forms' },
     // Before pages: WordPress refuses a page whose `template` it doesn't know yet.
-    { commandId: 'template:push', label: 'templates and parts' },
+    { commandId: 'theme:template:push', label: 'templates and parts' },
     { commandId: 'page:push', label: 'pages' },
     { commandId: 'seo:push', label: 'SEO' },
     { commandId: 'menu:push', label: 'menus' },
@@ -46,7 +47,7 @@ export default class Push extends LoopressCommand {
             this.log(`\n→ Pushing ${target.label}...`);
             try {
                 await stdoutToStderr(this.jsonEnabled(), async () => this.config.runCommand(target.commandId, argv));
-                this.log(`✓ ${target.label} pushed`);
+                this.log(this.dryRun ? `✓ ${target.label} would push` : `✓ ${target.label} pushed`);
                 results.push({ label: target.label, status: 'pushed' });
             }
             catch (error) {
@@ -64,7 +65,7 @@ export default class Push extends LoopressCommand {
                 .map((result) => `${result.label}: ${result.error}`);
             this.error(`${pluralize(this.failedCount, 'resource')} failed to push. ${failures.join('; ')}`);
         }
-        this.log('\nAll resources pushed.');
+        this.log(this.dryRun ? '\nEvery resource would push.' : '\nAll resources pushed.');
         return { results };
     }
     // Every delegated push always gets --yes: either this command's own guard already confirmed
@@ -84,7 +85,7 @@ export default class Push extends LoopressCommand {
             return false;
         try {
             const composerJson = JSON.parse(await readFile(path, 'utf8'));
-            return Object.keys(wpackagistRequire(composerJson, 'plugin')).length > 0;
+            return Object.keys(wpackagistRequire(composerJson, 'plugin', isLocalEnvironment(this.siteConfig.name))).length > 0;
         }
         catch {
             // Unreadable: let both commands run and report the parse error themselves.

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

@@ -1,17 +1,24 @@
 import { LoopressCommand } from '../../lib/base.js';
+type SeoPullResult = {
+    path: string;
+    postTypes: string[];
+    status: 'dry-run' | 'success';
+};
 export default class Pull extends LoopressCommand {
     static args: {
         path: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static description: string;
+    static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
         'post-type': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<SeoPullResult>;
     private pullPostMeta;
     private pullRedirects;
     private pullSettings;
 }
+export {};

package/dist/commands/seo/pull.js

@@ -9,6 +9,7 @@ export default class Pull extends LoopressCommand {
         path: Args.string({ description: 'Path to SEO directory (overrides project config)' }),
     };
     static description = 'Pull SEO settings, post meta, and (if supported) redirects from WordPress';
+    static enableJsonFlag = true;
     static examples = ['$ lps seo pull', '$ lps seo pull --post-type post --post-type page'];
     static flags = {
         ...LoopressCommand.dryRunFlag,
@@ -27,6 +28,7 @@ export default class Pull extends LoopressCommand {
             await this.pullPostMeta(postType, path);
         }
         await this.pullRedirects(path);
+        return { path, postTypes, status: this.dryRun ? 'dry-run' : 'success' };
     }
     async pullPostMeta(postType, basePath) {
         const dir = join(basePath, 'post-meta', postType);

package/dist/commands/seo/push.d.ts

@@ -1,9 +1,14 @@
 import { PushCommand } from '../../lib/push-command.js';
+type SeoPushResult = {
+    path: string;
+    status: 'dry-run' | 'success';
+};
 export default class Push extends PushCommand {
     static args: {
         path: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static description: string;
+    static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
         'allow-external-redirects': import("@oclif/core/interfaces").BooleanFlag<boolean>;
@@ -11,7 +16,7 @@ export default class Push extends PushCommand {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     private allowExternalRedirects;
-    run(): Promise<void>;
+    run(): Promise<SeoPushResult>;
     private currentPostMetaRevision;
     private jsonFilesIn;
     private pushPostMeta;
@@ -21,3 +26,4 @@ export default class Push extends PushCommand {
     private pushSettings;
     private renameToCanonical;
 }
+export {};

package/dist/commands/seo/push.js

@@ -13,6 +13,7 @@ export default class Push extends PushCommand {
         path: Args.string({ description: 'Path to SEO directory (overrides project config)' }),
     };
     static description = 'Push SEO settings, post meta, and redirects to WordPress. Local redirect files created remotely are renamed on disk to the `<id>-<slug>` convention. Fails clearly per file if the active SEO plugin does not support redirects.';
+    static enableJsonFlag = true;
     static examples = ['$ lps seo push', '$ lps seo push --allow-external-redirects'];
     static flags = {
         ...PushCommand.dryRunFlag,
@@ -40,9 +41,10 @@ export default class Push extends PushCommand {
             this.error(`${pluralize(this.failedCount, 'SEO item')} failed to push.`);
         }
         if (this.dryRun)
-            return;
+            return { path, status: 'dry-run' };
         await this.recordSuccess();
         this.log('All SEO configuration pushed.');
+        return { path, status: 'success' };
     }
     async currentPostMetaRevision(postType, slug) {
         try {

package/dist/commands/snippet/publish.js

@@ -14,7 +14,7 @@ export default class Publish extends Command {
         path: Args.string({ description: 'Path to snippets directory (overrides project config)' }),
     };
     static description = 'Publish snippets to your Loopress account so they can be deployed to other projects. Does not touch any WordPress site.';
-    static examples = ['$ lps snippet publish', '$ lps snippet publish --path ./snippets'];
+    static examples = ['$ lps snippet publish', '$ lps snippet publish ./snippets'];
     async run() {
         const { args } = await this.parse(Publish);
         const { apiProjectId, localConfig, token } = await resolveLinkedProject((message) => this.error(message));

package/dist/commands/snippet/pull.js

@@ -19,7 +19,7 @@ export default class Pull extends LoopressCommand {
     };
     static description = 'Pull snippets from WordPress';
     static enableJsonFlag = true;
-    static examples = ['$ lps snippet pull', '$ lps snippet pull --path ./snippets'];
+    static examples = ['$ lps snippet pull', '$ lps snippet pull ./snippets'];
     static flags = {
         ...LoopressCommand.dryRunFlag,
         ...LoopressCommand.yesFlag,

package/dist/commands/snippet/push.js

@@ -15,7 +15,7 @@ export default class Push extends PushCommand {
     };
     static description = 'Push snippets to WordPress. Local snippet files created or updated remotely are renamed on disk to the `<id>-<slug>` convention.';
     static enableJsonFlag = true;
-    static examples = ['$ lps snippet push', '$ lps snippet push --path ./snippets'];
+    static examples = ['$ lps snippet push', '$ lps snippet push ./snippets'];
     static flags = {
         ...PushCommand.dryRunFlag,
         ...PushCommand.yesFlag,

package/dist/commands/status.d.ts

@@ -1,5 +1,6 @@
 import { Command } from '@oclif/core';
 type StatusInfo = {
+    environment?: string;
     environments?: string[];
     note?: string;
     project?: string;

package/dist/commands/status.js

@@ -37,7 +37,7 @@ export default class Status extends Command {
         }
         this.log(`Project:  ${project.name} (${env.name})`);
         this.log(`URL:      ${env.url}`);
-        return { project: `${project.name} (${env.name})`, url: env.url };
+        return { environment: env.name, project: `${project.name} (${env.name})`, url: env.url };
     }
     // Mirrors base.ts:resolveEnvironment with --env: the targeted project comes from
     // loopress.json when pinned, from the globally active project otherwise.
@@ -54,7 +54,7 @@ export default class Status extends Command {
         }
         this.log(`Project:  ${project.name} (${env.name}, via --env)`);
         this.log(`URL:      ${env.url}`);
-        return { project: `${project.name} (${env.name}, via --env)`, url: env.url };
+        return { environment: env.name, project: `${project.name} (${env.name}, via --env)`, url: env.url };
     }
     reportPinnedProject(projectId) {
         const project = configManager.getProject(projectId);
@@ -75,7 +75,7 @@ export default class Status extends Command {
             const env = project.environments[envNames[0]];
             this.log(`Project:  ${project.name} (${env.name})`);
             this.log(`URL:      ${env.url}`);
-            return { project: `${project.name} (${env.name})`, url: env.url };
+            return { environment: env.name, project: `${project.name} (${env.name})`, url: env.url };
         }
         const current = configManager.getCurrentProject();
         const currentEnv = current?.id === projectId ? configManager.getCurrentEnv() : null;
@@ -93,6 +93,6 @@ export default class Status extends Command {
         }
         this.log(`Project:  ${project.name} (${currentEnv.name})`);
         this.log(`URL:      ${currentEnv.url}`);
-        return { project: `${project.name} (${currentEnv.name})`, url: currentEnv.url };
+        return { environment: currentEnv.name, project: `${project.name} (${currentEnv.name})`, url: currentEnv.url };
     }
 }

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

@@ -1,15 +1,11 @@
 import { LoopressCommand } from '../../lib/base.js';
-import { type ComposerPullResult } from '../../utils/composer.js';
+type PullTargetResult = {
+    error?: string;
+    label: string;
+    status: 'failed' | 'pulled';
+};
 type PullResult = {
-    added: string[];
-    merged: Record<string, string>;
-    skipped?: ComposerPullResult['skipped'];
-    status: 'dry-run' | 'success';
-    updated: Array<{
-        from: string;
-        slug: string;
-        to: string;
-    }>;
+    results: PullTargetResult[];
 };
 export default class Pull extends LoopressCommand {
     static description: string;

package/dist/commands/theme/pull.js

@@ -1,43 +1,41 @@
-import { existsSync } from 'node:fs';
-import { join } from 'node:path';
 import { LoopressCommand } from '../../lib/base.js';
-import { pullIntoComposerJson } from '../../utils/composer.js';
-import { writeLocalConfig } from '../../utils/loopress-config.js';
-import { mergePluginManifest } from '../../utils/plugins.js';
-import { parseInstalledThemes } from '../../utils/themes.js';
+import { stdoutToStderr } from '../../lib/json-delegation.js';
+import { pluralize } from '../../utils/pluralize.js';
+// Templates and parts have no pull: the child theme is written from the project, never read back.
+const PULL_TARGETS = [
+    { commandId: 'theme:version:pull', label: 'theme versions' },
+    { commandId: 'theme:style:pull', label: 'Global Styles' },
+];
 export default class Pull extends LoopressCommand {
-    static description = 'Pull installed themes from WordPress into loopress.json, pinned to their live versions';
+    static description = 'Pull everything theme related from WordPress: theme versions and Global Styles';
     static enableJsonFlag = true;
-    static examples = ['$ lps theme pull'];
+    static examples = ['$ lps theme pull', '$ lps theme pull --env staging', '$ lps theme pull --dry-run'];
     static flags = {
         ...LoopressCommand.dryRunFlag,
     };
     async run() {
-        const { url } = this.siteConfig;
-        this.log(`Pulling themes from ${url}`);
-        const raw = await this.wp.get('wp/v2/themes');
-        const installed = parseInstalledThemes(raw);
-        const incoming = Object.fromEntries(installed.map((t) => [t.slug, t.version]));
-        // A composer.json is authoritative over loopress.json: pin the live versions there instead.
-        const composerJsonPath = join(process.cwd(), this.rootDir, 'composer.json');
-        if (existsSync(composerJsonPath)) {
-            const result = await pullIntoComposerJson(composerJsonPath, 'theme', incoming, {
-                dryRun: this.dryRun,
-                log: this.log.bind(this),
-            });
-            return { ...result, status: this.dryRun ? 'dry-run' : 'success' };
+        const argv = ['--env', this.siteConfig.name];
+        if (this.dryRun)
+            argv.push('--dry-run');
+        const results = [];
+        for (const target of PULL_TARGETS) {
+            this.log(`\n→ Pulling ${target.label}...`);
+            try {
+                await stdoutToStderr(this.jsonEnabled(), async () => this.config.runCommand(target.commandId, argv));
+                this.log(`✓ ${target.label} pulled`);
+                results.push({ label: target.label, status: 'pulled' });
+            }
+            catch (error) {
+                const { message } = error;
+                this.log(`✗ ${target.label} failed: ${message}`);
+                results.push({ error: message, label: target.label, status: 'failed' });
+            }
         }
-        const { added, merged, updated } = mergePluginManifest(this.localConfig.themes ?? {}, incoming);
-        if (this.dryRun) {
-            this.log(`[dry-run] Would write ${Object.keys(merged).length} themes to loopress.json`);
-            return { added, merged, status: 'dry-run', updated };
+        const failures = results.filter((result) => result.status === 'failed');
+        if (failures.length > 0) {
+            const reasons = failures.map((result) => `${result.label}: ${result.error}`);
+            this.error(`${pluralize(failures.length, 'theme resource')} failed to pull. ${reasons.join('; ')}`);
         }
-        await writeLocalConfig({ ...this.localConfig, themes: merged });
-        this.log(`Wrote ${Object.keys(merged).length} themes to loopress.json`);
-        if (added.length > 0)
-            this.log(`  + Added: ${added.join(', ')}`);
-        for (const u of updated)
-            this.log(`  ~ Updated: ${u.slug} ${u.from} → ${u.to}`);
-        return { added, merged, status: 'success', updated };
+        return { results };
     }
 }

package/dist/commands/theme/push.d.ts

@@ -1,11 +1,13 @@
-import { PushCommand } from '../../lib/push-command.js';
+import { LoopressCommand } from '../../lib/base.js';
+type PushTargetResult = {
+    error?: string;
+    label: string;
+    status: 'failed' | 'pushed';
+};
 type PushResult = {
-    installed: string[];
-    pinned: string[];
-    removed: string[];
-    status: 'composer-managed' | 'dry-run' | 'in-sync' | 'success';
+    results: PushTargetResult[];
 };
-export default class Push extends PushCommand {
+export default class Push extends LoopressCommand {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];
@@ -15,8 +17,5 @@ export default class Push extends PushCommand {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<PushResult>;
-    private fetchInstanceLock;
-    private guardForce;
-    private sync;
 }
 export {};

package/dist/commands/theme/push.js

@@ -1,123 +1,66 @@
 import { Flags } from '@oclif/core';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { confirmUninstall } from '../../lib/interactive.js';
-import { PushCommand } from '../../lib/push-command.js';
-import { isNotFoundError } from '../../lib/wp-client.js';
-import { isDowngrade, parseCollisions, SYNC_TIMEOUT_MS } from '../../utils/plugin-sync.js';
-import { lockedWpackagistSlugs } from '../../utils/plugins.js';
-import { diffThemes, parseInstalledThemes } from '../../utils/themes.js';
-const IN_SYNC = { installed: [], pinned: [], removed: [], status: 'in-sync' };
-export default class Push extends PushCommand {
-    static description = 'Install themes on WordPress to match loopress.json (versions only, never switches the active theme)';
+import { LoopressCommand } from '../../lib/base.js';
+import { guardProductionPush } from '../../lib/guard-production-push.js';
+import { stdoutToStderr } from '../../lib/json-delegation.js';
+import { pluralize } from '../../utils/pluralize.js';
+// The parent theme must be installed before its child theme is written, and Global Styles
+// belong to whichever theme is active, so they go last.
+const PUSH_TARGETS = [
+    { commandId: 'theme:version:push', label: 'theme versions' },
+    { commandId: 'theme:template:push', label: 'templates and parts' },
+    { commandId: 'theme:style:push', label: 'Global Styles' },
+];
+export default class Push extends LoopressCommand {
+    static description = 'Push everything theme related to WordPress: theme versions, templates and parts, then Global Styles';
     static enableJsonFlag = true;
-    static examples = ['$ lps theme push', '$ lps theme push --force'];
+    static examples = ['$ lps theme push', '$ lps theme push --env staging', '$ lps theme push --dry-run'];
     static flags = {
-        ...PushCommand.dryRunFlag,
-        ...PushCommand.yesFlag,
-        force: Flags.boolean({ default: false, description: 'Allow downgrades and take over themes installed outside Loopress' }),
+        ...LoopressCommand.dryRunFlag,
+        ...LoopressCommand.yesFlag,
+        force: Flags.boolean({ default: false, description: 'Passed to `lps theme version push`' }),
     };
     async run() {
         const { flags } = await this.parse(Push);
-        const { force } = flags;
-        if (existsSync(join(process.cwd(), this.rootDir, 'composer.json'))) {
-            this.warn('This project has a composer.json, which is authoritative. Run `lps composer push` instead.');
-            return { ...IN_SYNC, status: 'composer-managed' };
-        }
-        const manifest = this.localConfig.themes ?? {};
-        if (Object.keys(manifest).length === 0) {
-            this.error('No themes found in loopress.json. Run `lps theme pull` first.');
-        }
-        this.log(`Pushing themes to ${this.siteConfig.url}`);
-        const raw = await this.wp.get('wp/v2/themes');
-        const installed = parseInstalledThemes(raw);
-        const managed = lockedWpackagistSlugs(await this.fetchInstanceLock(), 'theme');
-        const diff = diffThemes(manifest, installed, managed);
-        this.guardForce(diff, force);
-        // Uninstalling the theme WordPress is currently rendering leaves the site with no active
-        // theme, which is a hard fatal. --force does not override this: switch the active theme
-        // on the site first, then the removal is safe. A --force takeover of a collision hits the
-        // same fatal: the server moves the existing folder out of the way before reinstalling it,
-        // so the active theme is briefly missing either way, an active collision is just as
-        // dangerous as an active removal.
-        const activeRemoval = [...diff.toRemove, ...diff.collisions.map((c) => c.slug)].find((slug) => installed.find((t) => t.slug === slug)?.active);
-        if (activeRemoval) {
-            this.error(`Refusing to uninstall "${activeRemoval}": it is the site's active theme. ` +
-                'Switch the site to another theme, then re-run to remove it.');
-        }
-        // A "latest" pin never shows as drift, but its newest upstream release may have moved, so
-        // a push must still run `composer update` to pick it up.
-        const hasLatestPin = Object.values(manifest).includes('latest');
-        if (!hasLatestPin && isNoop(diff)) {
-            this.log('Everything is already in sync.');
-            return { ...IN_SYNC };
-        }
-        if (isNoop(diff))
-            this.log('Refreshing themes pinned to "latest" to their newest releases.');
-        for (const a of diff.toInstall)
-            this.log(`  + ${a.slug} ${a.version}`);
-        for (const p of diff.toPin)
-            this.log(`  ~ ${p.slug} ${p.from} to ${p.to}`);
-        for (const s of diff.toRemove)
-            this.log(`  - ${s}`);
-        for (const c of diff.collisions)
-            this.log(`  ! ${c.slug} (take over)`);
-        if (this.dryRun)
-            return result(diff, 'dry-run', diff.toRemove, true);
-        if (!(await confirmUninstall(diff.toRemove, this.yes)))
-            this.error('Aborted.');
-        const response = await this.sync(manifest, force);
-        if (response.output.trim())
-            this.log(response.output.trim());
-        this.log('Themes synced.');
-        await this.recordSuccess();
-        return result(diff, 'success', response.removed ?? diff.toRemove, force);
-    }
-    async fetchInstanceLock() {
-        try {
-            const { composerLock } = await this.wp.get('loopress/v1/composer/lock');
-            return composerLock;
-        }
-        catch (error) {
-            if (isNotFoundError(error))
-                return null;
-            throw error;
-        }
-    }
-    guardForce(diff, force) {
-        if (force)
-            return;
-        if (diff.collisions.length > 0) {
-            const list = diff.collisions.map((c) => `${c.slug} (${c.installedVersion})`).join(', ');
-            this.error(`${list} installed outside Loopress. Re-run with --force to take them over, or remove them from loopress.json.`);
-        }
-        const downgrades = diff.toPin.filter((p) => isDowngrade(p.from, p.to));
-        if (downgrades.length > 0) {
-            const list = downgrades.map((p) => `${p.slug} ${p.from} to ${p.to}`).join(', ');
-            this.error(`Refusing to downgrade: ${list}. Re-run with --force.`);
-        }
-    }
-    async sync(manifest, force) {
-        try {
-            return await this.wp.post('loopress/v1/composer/sync', { force, intent: { themes: manifest }, lock: null }, { timeoutMs: SYNC_TIMEOUT_MS });
-        }
-        catch (error) {
-            if (parseCollisions(error)) {
-                this.error('The site rejected the push: themes installed outside Loopress. Re-run with --force.');
+        // Guarded once here, like `lps push`. Steps get --production-confirmed rather than --yes,
+        // so the versions step still asks before uninstalling themes unless the user passed --yes.
+        await guardProductionPush({
+            dryRun: this.dryRun,
+            error: (message) => this.error(message),
+            siteConfig: this.siteConfig,
+            yes: this.yes,
+        });
+        // Nothing to install and no composer.json: the versions step would only fail on an empty
+        // manifest, which must not fail a templates or styles only project.
+        const hasVersions = Object.keys(this.localConfig.themes ?? {}).length > 0 || existsSync(join(process.cwd(), this.rootDir, 'composer.json'));
+        const targets = hasVersions ? PUSH_TARGETS : PUSH_TARGETS.filter((target) => target.commandId !== 'theme:version:push');
+        const results = [];
+        for (const target of targets) {
+            const argv = ['--env', this.siteConfig.name, '--production-confirmed'];
+            if (this.yes)
+                argv.push('--yes');
+            if (this.dryRun)
+                argv.push('--dry-run');
+            if (flags.force && target.commandId === 'theme:version:push')
+                argv.push('--force');
+            this.log(`\n→ Pushing ${target.label}...`);
+            try {
+                await stdoutToStderr(this.jsonEnabled(), async () => this.config.runCommand(target.commandId, argv));
+                this.log(`✓ ${target.label} pushed`);
+                results.push({ label: target.label, status: 'pushed' });
+            }
+            catch (error) {
+                const { message } = error;
+                this.log(`✗ ${target.label} failed: ${message}`);
+                results.push({ error: message, label: target.label, status: 'failed' });
             }
-            throw error;
         }
+        const failures = results.filter((result) => result.status === 'failed');
+        if (failures.length > 0) {
+            const reasons = failures.map((result) => `${result.label}: ${result.error}`);
+            this.error(`${pluralize(failures.length, 'theme resource')} failed to push. ${reasons.join('; ')}`);
+        }
+        return { results };
     }
 }
-function isNoop(diff) {
-    return (diff.toInstall.length === 0 && diff.toPin.length === 0 && diff.toRemove.length === 0 && diff.collisions.length === 0);
-}
-function result(diff, status, removed, includeCollisions) {
-    const collisionSlugs = includeCollisions ? diff.collisions.map((c) => c.slug) : [];
-    return {
-        installed: [...diff.toInstall.map((a) => a.slug), ...collisionSlugs],
-        pinned: diff.toPin.map((p) => p.slug),
-        removed,
-        status,
-    };
-}

package/dist/commands/theme/style/pull.d.ts

@@ -1,12 +1,18 @@
 import { LoopressCommand } from '../../../lib/base.js';
+type ThemeStylePullResult = {
+    file: string;
+    status: 'dry-run' | 'success';
+};
 export default class Pull extends LoopressCommand {
     static args: {
         path: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static description: string;
+    static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<ThemeStylePullResult>;
 }
+export {};

package/dist/commands/theme/style/pull.js

@@ -8,6 +8,7 @@ export default class Pull extends LoopressCommand {
         path: Args.string({ description: 'Path to theme styles directory (overrides project config)' }),
     };
     static description = "Pull the active block theme's Global Styles customizations (Site Editor > Styles) from WordPress into a local file";
+    static enableJsonFlag = true;
     static examples = ['$ lps theme style pull'];
     static flags = {
         ...LoopressCommand.dryRunFlag,
@@ -22,10 +23,11 @@ export default class Pull extends LoopressCommand {
         const file = join(dir, themeStylesFileName(stylesheet));
         if (this.dryRun) {
             this.log(`[dry-run] Would pull Global Styles for "${stylesheet}" to ${file}`);
-            return;
+            return { file, status: 'dry-run' };
         }
         await mkdir(dir, { recursive: true });
         await writeFile(file, JSON.stringify(canonicalGlobalStyles(item), null, 2) + '\n');
         this.log(`Pulled Global Styles for "${stylesheet}" to ${file}`);
+        return { file, status: 'success' };
     }
 }

package/dist/commands/theme/style/push.d.ts

@@ -1,12 +1,19 @@
 import { PushCommand } from '../../../lib/push-command.js';
+type ThemeStylePushResult = {
+    file: string;
+    status: 'dry-run' | 'success';
+};
 export default class Push extends PushCommand {
     static args: {
         path: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     static description: string;
+    static enableJsonFlag: boolean;
     static examples: string[];
     static flags: {
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    run(): Promise<void>;
+    run(): Promise<ThemeStylePushResult>;
 }
+export {};

package/dist/commands/theme/style/push.js

@@ -9,9 +9,11 @@ export default class Push extends PushCommand {
         path: Args.string({ description: 'Path to theme styles directory (overrides project config)' }),
     };
     static description = "Push the local Global Styles file to the active block theme's Site Editor > Styles on WordPress";
+    static enableJsonFlag = true;
     static examples = ['$ lps theme style push'];
     static flags = {
         ...PushCommand.dryRunFlag,
+        ...PushCommand.yesFlag,
     };
     async run() {
         const { args } = await this.parse(Push);
@@ -32,7 +34,7 @@ export default class Push extends PushCommand {
         }
         if (this.dryRun) {
             this.log(`[dry-run] Would push: ${file}`);
-            return;
+            return { file, status: 'dry-run' };
         }
         const provider = getResourceStateProvider('theme-styles');
         const beforeState = await this.captureBeforePushState(provider, dir);
@@ -41,5 +43,6 @@ export default class Push extends PushCommand {
         this.log(`Pushed: ${file}`);
         await this.writeAfterPushSnapshot(provider, dir, beforeState);
         await this.recordSuccess();
+        return { file, status: 'success' };
     }
 }

package/dist/commands/{template → theme/template}/diff.d.ts

@@ -1,4 +1,4 @@
-import { DiffCommand, type DiffJson } from '../../lib/diff-command.js';
+import { DiffCommand, type DiffJson } from '../../../lib/diff-command.js';
 export default class Diff extends DiffCommand {
     static description: string;
     static enableJsonFlag: boolean;

package/dist/commands/{template → theme/template}/diff.js

@@ -1,9 +1,9 @@
-import { DiffCommand } from '../../lib/diff-command.js';
-import { getResourceStateProvider } from '../../lib/resource-state.js';
+import { DiffCommand } from '../../../lib/diff-command.js';
+import { getResourceStateProvider } from '../../../lib/resource-state.js';
 export default class Diff extends DiffCommand {
     static description = 'Show what differs in block templates and parts between your local files and a WordPress environment, or between two environments. Templates and parts edited in the Site Editor show up too.';
     static enableJsonFlag = true;
-    static examples = ['$ lps template diff', '$ lps template diff --env staging', '$ lps template diff --env staging --against production'];
+    static examples = ['$ lps theme template diff', '$ lps theme template diff --env staging', '$ lps theme template diff --env staging --against production'];
     static flags = { ...DiffCommand.againstFlag };
     async run() {
         const { flags } = await this.parse(Diff);