@loopress/cli 0.28.0 → 0.30.0

package/dist/commands/pull.js

@@ -7,17 +7,21 @@ import { pluralize } from '../utils/pluralize.js';
 const PULL_TARGETS = [
     { commandId: 'composer:pull', label: 'composer' },
     { commandId: 'plugin:pull', label: 'plugins' },
+    { commandId: 'cpt:pull', label: 'post types', supportsYes: true },
+    { commandId: 'taxonomy:pull', label: 'taxonomies', supportsYes: true },
+    { commandId: 'meta:pull', label: 'post meta', supportsYes: true },
+    { commandId: 'role:pull', label: 'roles', supportsYes: true },
     { commandId: 'acf:pull', label: 'ACF', supportsYes: true },
     { commandId: 'api:pull', label: 'API routes', supportsYes: true },
     { commandId: 'hook:pull', label: 'hooks', supportsYes: true },
     { commandId: 'form:pull', label: 'forms', supportsYes: true },
-    { commandId: 'seo:pull', label: 'SEO', supportsYes: true },
+    { commandId: 'pattern:pull', label: 'patterns', supportsYes: true },
     { commandId: 'menu:pull', label: 'menus', supportsYes: true },
     { commandId: 'option:pull', label: 'options', supportsYes: true },
     { commandId: 'snippet:pull', label: 'snippets', supportsYes: true },
 ];
 export default class Pull extends LoopressCommand {
-    static description = 'Pull all content, plugins, composer dependencies, ACF, API routes, hooks, forms, SEO, menus, options, and snippets, from WordPress';
+    static description = 'Pull all content, plugins, composer dependencies, post types, taxonomies, post meta, roles, ACF, API routes, hooks, forms, patterns, menus, options, and snippets, from WordPress';
     static enableJsonFlag = true;
     static examples = ['$ lps pull', '$ lps pull --env staging', '$ lps pull --dry-run'];
     static flags = {
@@ -27,6 +31,7 @@ export default class Pull extends LoopressCommand {
     failedCount = 0;
     async run() {
         const results = [];
+        this.warnRemovedSeoModule();
         for (const target of PULL_TARGETS) {
             this.log(`\n→ Pulling ${target.label}...`);
             try {

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
@@ -11,20 +12,26 @@ import { pluralize } from '../utils/pluralize.js';
 const PUSH_TARGETS = [
     { commandId: 'plugin:push', label: 'plugins' },
     { commandId: 'composer:push', label: 'composer' },
+    // Before ACF: a field group's location rule can target a Loopress post type or taxonomy.
+    { commandId: 'cpt:push', label: 'post types' },
+    { commandId: 'taxonomy:push', label: 'taxonomies' },
+    { commandId: 'meta:push', label: 'post meta' },
+    { commandId: 'role:push', label: 'roles' },
     { commandId: 'acf:push', label: 'ACF' },
     { commandId: 'api:push', label: 'API routes' },
     { commandId: 'hook:push', label: 'hooks' },
     { commandId: 'form:push', label: 'forms' },
+    // Before templates and pages, which can reference them (`wp:pattern`).
+    { commandId: 'pattern:push', label: 'patterns' },
     // 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' },
     { commandId: 'option:push', label: 'options' },
     { commandId: 'snippet:push', label: 'snippets' },
 ];
 export default class Push extends LoopressCommand {
-    static description = 'Push all local content, plugins, composer dependencies, ACF, API routes, hooks, forms, templates, pages, SEO, menus, options, and snippets, to WordPress';
+    static description = 'Push all local content, plugins, composer dependencies, post types, taxonomies, post meta, roles, ACF, API routes, hooks, forms, patterns, templates, pages, menus, options, and snippets, to WordPress';
     static enableJsonFlag = true;
     static examples = ['$ lps push', '$ lps push --env staging', '$ lps push --dry-run'];
     static flags = {
@@ -34,6 +41,7 @@ export default class Push extends LoopressCommand {
     failedCount = 0;
     async run() {
         await this.guardProductionPush();
+        this.warnRemovedSeoModule();
         const argv = this.buildArgv();
         const results = [];
         const composerPushedByPlugins = await this.composerDeclaresPlugins();
@@ -46,7 +54,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 +72,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 +92,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/role/diff.d.ts

@@ -0,0 +1,2 @@
+declare const _default: typeof import("../../lib/diff-command.js").DiffCommand;
+export default _default;

package/dist/commands/role/diff.js

@@ -0,0 +1,5 @@
+import { resourceDiffCommand } from '../../lib/diff-command.js';
+export default resourceDiffCommand('role', {
+    description: 'Show what differs in roles between your local roles/ files and a WordPress environment, or between two environments',
+    pathNoun: 'roles directory',
+});

package/dist/commands/role/list.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredListCommand>;
+export default _default;

package/dist/commands/role/list.js

@@ -0,0 +1,4 @@
+import { declaredListCommand } from '../../lib/declared-type-command.js';
+import { ROLE_SPEC } from '../../utils/declared-type-format.js';
+import { pluralize } from '../../utils/pluralize.js';
+export default declaredListCommand(ROLE_SPEC, 'List the user roles on WordPress, where each comes from (Loopress, WordPress, a plugin) and how many users have it. Only Loopress ones are pulled and pushed.', (count) => pluralize(count, 'user'));

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

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredPullCommand>;
+export default _default;

package/dist/commands/role/pull.js

@@ -0,0 +1,4 @@
+import { declaredPullCommand } from '../../lib/declared-type-command.js';
+import { ROLE_SPEC } from '../../utils/declared-type-format.js';
+export default declaredPullCommand(ROLE_SPEC, 'Pull the roles Loopress manages on WordPress into roles/<slug>.json files. ' +
+    'Built-in roles and roles created by a plugin are never pulled, see `lps role list`.');

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

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredPushCommand>;
+export default _default;

package/dist/commands/role/push.js

@@ -0,0 +1,4 @@
+import { declaredPushCommand } from '../../lib/declared-type-command.js';
+import { ROLE_SPEC } from '../../utils/declared-type-format.js';
+export default declaredPushCommand(ROLE_SPEC, 'Push local roles (roles/<slug>.json, a "name" and its "capabilities") to WordPress. ' +
+    'Create or update only, never deletes a role (use `lps role rm`), never changes which users have it.');

package/dist/commands/role/rm.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredRmCommand>;
+export default _default;

package/dist/commands/role/rm.js

@@ -0,0 +1,3 @@
+import { declaredRmCommand } from '../../lib/declared-type-command.js';
+import { ROLE_SPEC } from '../../utils/declared-type-format.js';
+export default declaredRmCommand(ROLE_SPEC, 'Stop registering a Loopress role on WordPress. Its users keep it in their profile, with no capability until the role is pushed again.', 'Its users keep it in their profile, with no capability until it is pushed again.');

package/dist/commands/role/rollback.d.ts

@@ -0,0 +1,2 @@
+declare const _default: typeof import("../../lib/base.js").LoopressCommand;
+export default _default;

package/dist/commands/role/rollback.js

@@ -0,0 +1,5 @@
+import { resourceRollbackCommand } from '../../lib/rollback-command.js';
+export default resourceRollbackCommand('role', {
+    description: 'Restore roles to a snapshot taken automatically before an earlier `lps role push`',
+    pathNoun: 'roles directory',
+});

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;
@@ -17,8 +18,7 @@ export default class Status extends Command {
         env: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<StatusResult>;
-    private reportActiveProject;
-    private reportEnvOverride;
-    private reportPinnedProject;
+    private logTarget;
+    private report;
 }
 export {};

package/dist/commands/status.js

@@ -11,52 +11,26 @@ export default class Status extends Command {
     };
     async run() {
         const { flags } = await this.parse(Status);
-        const localConfig = await readLocalConfig();
-        let info;
-        if (flags.env) {
-            info = this.reportEnvOverride(localConfig.projectId, flags.env);
-        }
-        else if (localConfig.projectId) {
-            info = this.reportPinnedProject(localConfig.projectId);
-        }
-        else {
-            info = this.reportActiveProject();
-        }
+        const { projectId } = await readLocalConfig();
+        const info = this.report(projectId, flags.env);
         this.log('');
         this.log(`Config dir: ${this.config.configDir}`);
         this.log(`Data dir:   ${this.config.dataDir}`);
         return { ...info, configDir: this.config.configDir, dataDir: this.config.dataDir };
     }
-    reportActiveProject() {
-        const env = configManager.getCurrentEnv();
-        const project = env ? configManager.getCurrentProject() : undefined;
-        if (!env || !project) {
-            const note = 'No project configured. Run `lps project config` first.';
-            this.log(note);
-            return { note };
-        }
-        this.log(`Project:  ${project.name} (${env.name})`);
+    logTarget(label, env) {
+        this.log(`Project:  ${label}`);
         this.log(`URL:      ${env.url}`);
-        return { project: `${project.name} (${env.name})`, url: env.url };
+        return { environment: env.name, project: label, url: env.url };
     }
-    // Mirrors base.ts:resolveEnvironment with --env: the targeted project comes from
-    // loopress.json when pinned, from the globally active project otherwise.
-    reportEnvOverride(pinnedProjectId, envName) {
-        const project = pinnedProjectId ? configManager.getProject(pinnedProjectId) : configManager.getCurrentProject();
-        if (!project) {
+    // Mirrors base.ts:resolveEnvironment, reporting instead of failing where it can.
+    report(pinnedProjectId, envName) {
+        const projectId = pinnedProjectId ?? configManager.getCurrentProject()?.id;
+        if (!projectId) {
             const note = 'No project configured. Run `lps project config` first.';
             this.log(note);
             return { note };
         }
-        const env = project.environments[envName];
-        if (!env) {
-            this.error(`Environment "${envName}" not found in project "${project.name}". Available: ${Object.keys(project.environments).join(', ')}`);
-        }
-        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 };
-    }
-    reportPinnedProject(projectId) {
         const project = configManager.getProject(projectId);
         if (!project) {
             const note = `loopress.json pins project "${projectId}", but it no longer exists. Run \`lps project config\` to configure it.`;
@@ -71,28 +45,22 @@ export default class Status extends Command {
             this.log(note);
             return { note, project: project.name };
         }
-        if (envNames.length === 1) {
-            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 };
+        if (envName) {
+            const env = project.environments[envName];
+            if (!env) {
+                this.error(`Environment "${envName}" not found in project "${project.name}". Available: ${envNames.join(', ')}`);
+            }
+            return this.logTarget(`${project.name} (${env.name}, via --env)`, env);
         }
-        const current = configManager.getCurrentProject();
-        const currentEnv = current?.id === projectId ? configManager.getCurrentEnv() : null;
-        if (!currentEnv) {
-            const note = `"${project.name}" has multiple environments and isn't the globally active project. Run \`lps project switch\` to pick one.`;
-            this.log(`Project:  ${project.name} ${c('yellow', '(ambiguous)')}`);
+        const env = configManager.getDefaultEnvironment(projectId);
+        if (!env) {
+            const note = `"${project.name}" has no "local" environment, pass --env to pick one.`;
+            this.log(`Project:  ${project.name} ${c('yellow', '(no default environment)')}`);
             this.log(`Environments: ${envNames.join(', ')}`);
             this.log('');
-            this.warn(`"${project.name}" has multiple environments and isn't the globally active project.`);
-            this.log('Run `lps project switch` to pick one before running commands here.');
-            if (current) {
-                this.log(`(Globally active project right now: "${current.name}")`);
-            }
+            this.warn(note);
             return { environments: envNames, note, project: project.name };
         }
-        this.log(`Project:  ${project.name} (${currentEnv.name})`);
-        this.log(`URL:      ${currentEnv.url}`);
-        return { project: `${project.name} (${currentEnv.name})`, url: currentEnv.url };
+        return this.logTarget(`${project.name} (${env.name})`, env);
     }
 }

package/dist/commands/taxonomy/diff.d.ts

@@ -0,0 +1,2 @@
+declare const _default: typeof import("../../lib/diff-command.js").DiffCommand;
+export default _default;

package/dist/commands/taxonomy/diff.js

@@ -0,0 +1,5 @@
+import { resourceDiffCommand } from '../../lib/diff-command.js';
+export default resourceDiffCommand('taxonomy', {
+    description: 'Show what differs in taxonomies between your local taxonomies/ files and a WordPress environment, or between two environments',
+    pathNoun: 'taxonomies directory',
+});

package/dist/commands/taxonomy/list.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredListCommand>;
+export default _default;

package/dist/commands/taxonomy/list.js

@@ -0,0 +1,5 @@
+import { declaredListCommand } from '../../lib/declared-type-command.js';
+import { TAXONOMY_SPEC } from '../../utils/declared-type-format.js';
+import { pluralize } from '../../utils/pluralize.js';
+export default declaredListCommand(TAXONOMY_SPEC, 'List the taxonomies registered on WordPress, where each comes from (Loopress, WordPress, ACF, CPT UI, a theme or plugin) ' +
+    'and the post types it attaches to. Only Loopress ones are pulled and pushed.', (count) => pluralize(count, 'term'));

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

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredPullCommand>;
+export default _default;

package/dist/commands/taxonomy/pull.js

@@ -0,0 +1,4 @@
+import { declaredPullCommand } from '../../lib/declared-type-command.js';
+import { TAXONOMY_SPEC } from '../../utils/declared-type-format.js';
+export default declaredPullCommand(TAXONOMY_SPEC, 'Pull the taxonomies Loopress manages on WordPress into taxonomies/<slug>.json files, never their terms. ' +
+    'Taxonomies registered by a theme or another plugin are never pulled, see `lps taxonomy list`.');

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

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredPushCommand>;
+export default _default;

package/dist/commands/taxonomy/push.js

@@ -0,0 +1,4 @@
+import { declaredPushCommand } from '../../lib/declared-type-command.js';
+import { TAXONOMY_SPEC } from '../../utils/declared-type-format.js';
+export default declaredPushCommand(TAXONOMY_SPEC, 'Push local taxonomies (taxonomies/<slug>.json, register_taxonomy() arguments plus "object_type") to WordPress. ' +
+    'Create or update only, never deletes a taxonomy (use `lps taxonomy rm`), never touches its terms.');

package/dist/commands/taxonomy/rm.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("../../lib/php-files-command.js").CommandClass<import("../../lib/declared-type-command.js").DeclaredRmCommand>;
+export default _default;

package/dist/commands/taxonomy/rm.js

@@ -0,0 +1,3 @@
+import { declaredRmCommand } from '../../lib/declared-type-command.js';
+import { TAXONOMY_SPEC } from '../../utils/declared-type-format.js';
+export default declaredRmCommand(TAXONOMY_SPEC, 'Stop registering a Loopress taxonomy on WordPress. Its terms are kept in the database, hidden until the taxonomy is pushed again.', "Its terms are kept in the database, hidden until it's pushed again.");

package/dist/commands/taxonomy/rollback.d.ts

@@ -0,0 +1,2 @@
+declare const _default: typeof import("../../lib/base.js").LoopressCommand;
+export default _default;

package/dist/commands/taxonomy/rollback.js

@@ -0,0 +1,5 @@
+import { resourceRollbackCommand } from '../../lib/rollback-command.js';
+export default resourceRollbackCommand('taxonomy', {
+    description: 'Restore taxonomies to a snapshot taken automatically before an earlier `lps taxonomy push`',
+    pathNoun: 'taxonomies directory',
+});

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 {};