@adobe/aem-cli 16.19.13 → 16.20.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [16.20.0](https://github.com/adobe/helix-cli/compare/v16.19.14...v16.20.0) (2026-06-04)
+
+
+### Features
+
+* **content:** add --org/--site options to aem content clone ([#2738](https://github.com/adobe/helix-cli/issues/2738)) ([58f5b54](https://github.com/adobe/helix-cli/commit/58f5b54c729990359e11a02f569866083ac1c393)), closes [#2725](https://github.com/adobe/helix-cli/issues/2725)
+
+## [16.19.14](https://github.com/adobe/helix-cli/compare/v16.19.13...v16.19.14) (2026-06-04)
+
+
+### Bug Fixes
+
+* **content:** use org/site terminology and centralize config reading ([#2737](https://github.com/adobe/helix-cli/issues/2737)) ([bb0d357](https://github.com/adobe/helix-cli/commit/bb0d35744b41487245c269de6000a0d9a23d5bdb))
+
 ## [16.19.13](https://github.com/adobe/helix-cli/compare/v16.19.12...v16.19.13) (2026-06-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.19.13",
+  "version": "16.20.0",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",

package/src/content/clone.cmd.js

@@ -67,6 +67,8 @@ export default class CloneCommand {
     this._force = false;
     this._assumeYes = false;
     this._rootPath = null;
+    this._org = null;
+    this._site = null;
   }
 
   withDirectory(dir) {
@@ -94,6 +96,16 @@ export default class CloneCommand {
     return this;
   }
 
+  withOrg(org) {
+    this._org = org ? org.trim() : null;
+    return this;
+  }
+
+  withSite(site) {
+    this._site = site ? site.trim() : null;
+    return this;
+  }
+
   async run() {
     const { log } = this;
 
@@ -101,14 +113,23 @@ export default class CloneCommand {
       throw new Error('Clone root path was not set (internal error).');
     }
 
-    // 1. Resolve owner/repo from git remote
-    const originUrl = await GitUtils.getOriginURL(this._dir);
-    if (!originUrl) {
-      throw new Error('No git remote found. Run `aem content clone` inside an AEM project directory.');
+    // 1. Resolve org/site: explicit --org/--site override, otherwise derive from git remote
+    const hasOrg = !!this._org;
+    const hasSite = !!this._site;
+    let org;
+    let site;
+    if (hasOrg && hasSite) {
+      org = this._org.toLowerCase();
+      site = this._site.toLowerCase();
+    } else {
+      const originUrl = await GitUtils.getOriginURL(this._dir);
+      if (!originUrl) {
+        throw new Error('No git remote found. Run `aem content clone` inside an AEM project directory.');
+      }
+      org = originUrl.owner.toLowerCase();
+      site = originUrl.repo.toLowerCase();
     }
-    const owner = originUrl.owner.toLowerCase();
-    const repo = originUrl.repo.toLowerCase();
-    log.info(`Cloning content from da.live: ${owner}/${repo}${this._rootPath === '/' ? '' : ` @ ${this._rootPath}`}`);
+    log.info(`Cloning content from da.live: ${org}/${site}${this._rootPath === '/' ? '' : ` @ ${this._rootPath}`}`);
 
     // 2. Ensure target path is available (do not create content/ until after file count is known)
     const contentDir = path.resolve(this._dir, CONTENT_DIR);
@@ -126,7 +147,7 @@ export default class CloneCommand {
     const client = new DaClient(token);
     log.info('Fetching file list...');
     const showDiscoveryProgress = process.stdout.isTTY;
-    const files = await client.listAll(owner, repo, this._rootPath, showDiscoveryProgress
+    const files = await client.listAll(org, site, this._rootPath, showDiscoveryProgress
       ? (n) => {
         process.stdout.write(`\r  ${n} file(s) discovered so far...`);
       }
@@ -148,15 +169,15 @@ export default class CloneCommand {
     const downloadResults = await processQueue(
       files,
       async (file) => {
-        const prefix = `/${owner}/${repo}`;
+        const prefix = `/${org}/${site}`;
         if (!file.path.startsWith(prefix)) {
-          log.warn(`  skip (unexpected path, missing owner/repo prefix): ${file.path}`);
+          log.warn(`  skip (unexpected path, missing org/site prefix): ${file.path}`);
           return { status: 404 };
         }
         const daPath = file.path.slice(prefix.length) || '/';
         const localPath = path.join(contentDir, ...daPath.split('/').filter(Boolean));
         try {
-          const res = await client.getSource(owner, repo, daPath);
+          const res = await client.getSource(org, site, daPath);
           if (!res) {
             log.warn(`  skip (not found): ${daPath}`);
             return { status: 404 };
@@ -195,7 +216,7 @@ export default class CloneCommand {
     await git.commit({
       fs,
       dir: contentDir,
-      message: `clone: ${owner}/${repo}${this._rootPath === '/' ? '' : ` (${this._rootPath})`}`,
+      message: `clone: ${org}/${site}${this._rootPath === '/' ? '' : ` (${this._rootPath})`}`,
       author: GIT_AUTHOR,
     });
     const headOid = await git.resolveRef({ fs, dir: contentDir, ref: 'HEAD' });
@@ -203,8 +224,8 @@ export default class CloneCommand {
 
     // 8. Write config (not tracked by git)
     await fse.writeJson(path.join(contentDir, CONFIG_FILE), {
-      owner,
-      repo,
+      org,
+      site,
       rootPath: this._rootPath,
     }, { spaces: 2 });
 

package/src/content/clone.js

@@ -22,6 +22,14 @@ export default function clone() {
     description: 'Clone da.live content locally into content/',
     builder: (yargs) => {
       yargs
+        .option('org', {
+          describe: 'da.live org to clone from. Overrides the org derived from the git remote.',
+          type: 'string',
+        })
+        .option('site', {
+          describe: 'da.live site to clone from. Overrides the site derived from the git remote.',
+          type: 'string',
+        })
         .option('path', {
           describe: 'da.live folder to clone (e.g. /ca/fr_ca). Omit only when using --all.',
           type: 'string',
@@ -47,6 +55,11 @@ export default function clone() {
           default: false,
         })
         .check((argv) => {
+          const org = (argv.org || '').trim();
+          const site = (argv.site || '').trim();
+          if ((org && !site) || (!org && site)) {
+            return '--org and --site must be used together.';
+          }
           if (argv.all && argv.path !== undefined && argv.path !== '') {
             return 'Do not use --path together with --all.';
           }
@@ -67,6 +80,8 @@ export default function clone() {
         .withToken(argv.token)
         .withForce(argv.force)
         .withAssumeYes(argv.yes)
+        .withOrg(argv.org)
+        .withSite(argv.site)
         .withRootPath(rootPath)
         .run();
     },

package/src/content/content-shared.js

@@ -10,6 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
+import path from 'path';
+import fse from 'fs-extra';
+
 export const CONTENT_DIR = 'content';
 export const CONFIG_FILE = '.da-config.json';
 export const GIT_AUTHOR = { name: 'aem-cli', email: 'aem-cli@adobe.com' };
@@ -22,6 +25,28 @@ export const LARGE_CLONE_FILE_THRESHOLD = 10000;
  */
 export const CONTENT_IO_CONCURRENCY = 10;
 
+/**
+ * Reads and normalizes the content config from a content directory.
+ * Accepts both current keys (org/site) and legacy keys (owner/repo) written
+ * by earlier versions of clone. org/site take priority when both are present.
+ * @param {string} contentDir - absolute path to the content/ directory
+ * @returns {Promise<{org: string, site: string, rootPath: string|undefined}>}
+ * @throws if the config file is missing or org/site cannot be resolved
+ */
+export async function readContentConfig(contentDir) {
+  const configPath = path.join(contentDir, CONFIG_FILE);
+  if (!await fse.pathExists(configPath)) {
+    throw new Error(`No config found at ${configPath}. Run 'aem content clone' first.`);
+  }
+  const raw = await fse.readJson(configPath);
+  const org = (raw.org || raw.owner || '').toLowerCase();
+  const site = (raw.site || raw.repo || '').toLowerCase();
+  if (!org || !site) {
+    throw new Error(`Invalid config: org and site are required in ${configPath}.`);
+  }
+  return { org, site, rootPath: raw.rootPath };
+}
+
 /**
  * Normalizes a da.live path: leading slash, no trailing slash except root.
  * @param {string} input

package/src/content/da-api.js

@@ -39,12 +39,12 @@ export class DaClient {
   /**
    * Lists the contents of a directory, following {@link LIST_CONTINUATION_HEADER} until complete.
    * @param {string} org
-   * @param {string} repo
+   * @param {string} site
    * @param {string} daPath - path starting with /
    * @returns {Promise<Array<{path, name, ext?, lastModified}>>}
    */
-  async list(org, repo, daPath) {
-    const url = `${DA_ADMIN}/list/${org}/${repo}${daPath}`;
+  async list(org, site, daPath) {
+    const url = `${DA_ADMIN}/list/${org}/${site}${daPath}`;
     const aggregated = [];
     let continuation = null;
 
@@ -81,13 +81,13 @@ export class DaClient {
   /**
    * Recursively lists all files under a path using a non-recursive queue-based approach.
    * @param {string} org
-   * @param {string} repo
+   * @param {string} site
    * @param {string} [daPath='/']
    * @param {(discoveredCount: number) => void} [onDiscovered] - cumulative file count per discovery
    * @returns {Promise<Array<{path, name, ext, lastModified}>>}
    */
-  async listAll(org, repo, daPath = '/', onDiscovered = undefined) {
-    const prefix = `/${org}/${repo}`;
+  async listAll(org, site, daPath = '/', onDiscovered = undefined) {
+    const prefix = `/${org}/${site}`;
     const files = [];
     let dirsToProcess = [daPath];
 
@@ -97,7 +97,7 @@ export class DaClient {
       await processQueue(
         dirsToProcess,
         async (currentPath) => {
-          const items = await this.list(org, repo, currentPath);
+          const items = await this.list(org, site, currentPath);
           for (const item of items) {
             if (item.ext !== undefined) {
               files.push(item);
@@ -119,10 +119,13 @@ export class DaClient {
 
   /**
    * Fetches the raw content of a file.
+   * @param {string} org
+   * @param {string} site
+   * @param {string} daPath
    * @returns {Promise<Response|null>}
    */
-  async getSource(org, repo, daPath) {
-    const url = `${DA_ADMIN}/source/${org}/${repo}${daPath}`;
+  async getSource(org, site, daPath) {
+    const url = `${DA_ADMIN}/source/${org}/${site}${daPath}`;
     const res = await this.fetch(url, { headers: this.authHeader });
     if (res.status === 401) {
       throw new Error('Unauthorized: invalid or missing token');
@@ -139,14 +142,14 @@ export class DaClient {
   /**
    * Uploads a file via PUT.
    * @param {string} org
-   * @param {string} repo
+   * @param {string} site
    * @param {string} daPath
    * @param {Buffer} buffer
    * @param {string} contentType
    * @returns {Promise<object>} API response body
    */
-  async putSource(org, repo, daPath, buffer, contentType) {
-    const url = `${DA_ADMIN}/source/${org}/${repo}${daPath}`;
+  async putSource(org, site, daPath, buffer, contentType) {
+    const url = `${DA_ADMIN}/source/${org}/${site}${daPath}`;
     const res = await this.fetch(url, {
       method: 'PUT',
       headers: { ...this.authHeader, 'Content-Type': contentType },
@@ -165,8 +168,8 @@ export class DaClient {
    * Deletes a file or folder. Idempotent: 404 is treated as success.
    * Throws on transport or server errors so callers don't silently treat them as success.
    */
-  async deleteSource(org, repo, daPath) {
-    const url = `${DA_ADMIN}/source/${org}/${repo}${daPath}`;
+  async deleteSource(org, site, daPath) {
+    const url = `${DA_ADMIN}/source/${org}/${site}${daPath}`;
     const res = await this.fetch(url, {
       method: 'DELETE',
       headers: this.authHeader,
@@ -183,12 +186,12 @@ export class DaClient {
   /**
    * Returns the current lastModified for a file via a HEAD request.
    * @param {string} org
-   * @param {string} repo
+   * @param {string} site
    * @param {string} daPath - e.g. /blog/post.html
    * @returns {Promise<number|null>}
    */
-  async getRemoteLastModified(org, repo, daPath) {
-    const url = `${DA_ADMIN}/source/${org}/${repo}${daPath}`;
+  async getRemoteLastModified(org, site, daPath) {
+    const url = `${DA_ADMIN}/source/${org}/${site}${daPath}`;
     const res = await this.fetch(url, { method: 'HEAD', headers: this.authHeader });
     if (res.status === 401) {
       throw new Error('Unauthorized: invalid or missing token');

package/src/content/diff.cmd.js

@@ -17,7 +17,7 @@ import { createTwoFilesPatch } from 'diff';
 import chalk from 'chalk-template';
 import { DaClient } from './da-api.js';
 import { getValidToken } from './da-auth.js';
-import { CONTENT_DIR, CONFIG_FILE } from './content-shared.js';
+import { CONTENT_DIR, readContentConfig } from './content-shared.js';
 
 function printPatch(patch) {
   for (const line of patch.split('\n')) {
@@ -60,12 +60,7 @@ export default class DiffCommand {
   async run() {
     const { log } = this;
     const contentDir = path.resolve(this._dir, CONTENT_DIR);
-    const configPath = path.join(contentDir, CONFIG_FILE);
-
-    if (!await fse.pathExists(configPath)) {
-      throw new Error('No config found. Run \'aem content clone\' first.');
-    }
-    const { org, repo } = await fse.readJson(configPath);
+    const { org, site } = await readContentConfig(contentDir);
 
     const matrix = await git.statusMatrix({ fs, dir: contentDir });
     let changedPaths = matrix
@@ -98,7 +93,7 @@ export default class DiffCommand {
         ? await fse.readFile(localPath)
         : Buffer.from('');
 
-      const remoteRes = await client.getSource(org, repo, daPath);
+      const remoteRes = await client.getSource(org, site, daPath);
 
       const localText = localBuffer.toString('utf-8');
       const remoteText = remoteRes ? await remoteRes.text() : '';

package/src/content/merge.cmd.js

@@ -16,7 +16,7 @@ import git from 'isomorphic-git';
 import { diff3Merge } from 'node-diff3'; // eslint-disable-line import/no-unresolved
 import { DaClient } from './da-api.js';
 import { getValidToken } from './da-auth.js';
-import { CONTENT_DIR, CONFIG_FILE } from './content-shared.js';
+import { CONTENT_DIR, readContentConfig } from './content-shared.js';
 
 /**
  * 3-way merge using diff3 algorithm.
@@ -69,12 +69,7 @@ export default class MergeCommand {
   async run() {
     const { log } = this;
     const contentDir = path.resolve(this._dir, CONTENT_DIR);
-    const configPath = path.join(contentDir, CONFIG_FILE);
-
-    if (!await fse.pathExists(configPath)) {
-      throw new Error('No config found. Run \'aem content clone\' first.');
-    }
-    const { org, repo } = await fse.readJson(configPath);
+    const { org, site } = await readContentConfig(contentDir);
 
     // Find locally changed files via git
     const matrix = await git.statusMatrix({ fs, dir: contentDir });
@@ -112,7 +107,7 @@ export default class MergeCommand {
       // eslint-disable-next-line no-await-in-loop
       const [localBuffer, remoteRes, blobResult] = await Promise.all([
         fse.readFile(localPath),
-        client.getSource(org, repo, daPath),
+        client.getSource(org, site, daPath),
         git.readBlob({
           fs, dir: contentDir, oid: headCommit.oid, filepath: relPath,
         })

package/src/content/push.cmd.js

@@ -18,8 +18,8 @@ import { DaClient, getContentType } from './da-api.js';
 import { getValidToken } from './da-auth.js';
 import {
   CONTENT_DIR,
-  CONFIG_FILE,
   CONTENT_IO_CONCURRENCY,
+  readContentConfig,
 } from './content-shared.js';
 import {
   resolveSyncedOid,
@@ -67,19 +67,19 @@ export default class PushCommand {
    * Checks for conflicts between local changes and remote modifications.
    * @param {DaClient} client
    * @param {string} org
-   * @param {string} repo
+   * @param {string} site
    * @param {string[]} modified
    * @param {string[]} deleted
    * @param {number} lastSyncTime
    * @returns {Promise<boolean>} true if the push should be aborted
    */
-  async _checkConflicts(client, org, repo, modified, deleted, lastSyncTime) {
+  async _checkConflicts(client, org, site, modified, deleted, lastSyncTime) {
     const { log } = this;
     const conflicts = [];
 
     for (const daPath of [...modified, ...deleted]) {
       // eslint-disable-next-line no-await-in-loop
-      const remoteLastModified = await client.getRemoteLastModified(org, repo, daPath);
+      const remoteLastModified = await client.getRemoteLastModified(org, site, daPath);
       if (remoteLastModified != null && remoteLastModified > lastSyncTime) {
         conflicts.push({ daPath, remoteDate: new Date(remoteLastModified).toLocaleString() });
       }
@@ -105,12 +105,12 @@ export default class PushCommand {
    * Uploads added and modified files to da.live.
    * @param {DaClient} client
    * @param {string} org
-   * @param {string} repo
+   * @param {string} site
    * @param {string} contentDir
    * @param {string[]} targets
    * @returns {Promise<{ pushed: number, errors: number }>}
    */
-  async _uploadFiles(client, org, repo, contentDir, targets) {
+  async _uploadFiles(client, org, site, contentDir, targets) {
     const { log } = this;
     let pushed = 0;
     let errors = 0;
@@ -123,7 +123,7 @@ export default class PushCommand {
         const ext = daPath.split('.').pop();
         try {
           const buffer = await fse.readFile(localPath);
-          await client.putSource(org, repo, daPath, buffer, getContentType(ext));
+          await client.putSource(org, site, daPath, buffer, getContentType(ext));
           log.info(`  ✓ ${daPath}`);
           return { ok: true };
         } catch (err) {
@@ -148,11 +148,11 @@ export default class PushCommand {
    * Deletes files from da.live.
    * @param {DaClient} client
    * @param {string} org
-   * @param {string} repo
+   * @param {string} site
    * @param {string[]} deleted
    * @returns {Promise<{ pushed: number, errors: number }>}
    */
-  async _deleteFiles(client, org, repo, deleted) {
+  async _deleteFiles(client, org, site, deleted) {
     const { log } = this;
     let pushed = 0;
     let errors = 0;
@@ -162,7 +162,7 @@ export default class PushCommand {
       [...deleted],
       async (daPath) => {
         try {
-          await client.deleteSource(org, repo, daPath);
+          await client.deleteSource(org, site, daPath);
           log.info(`  ✓ deleted ${daPath}`);
           return { ok: true };
         } catch (err) {
@@ -186,12 +186,7 @@ export default class PushCommand {
   async run() {
     const { log } = this;
     const contentDir = path.resolve(this._dir, CONTENT_DIR);
-    const configPath = path.join(contentDir, CONFIG_FILE);
-
-    if (!await fse.pathExists(configPath)) {
-      throw new Error(`No config found at ${configPath}. Run 'aem content clone' first.`);
-    }
-    const { org, repo } = await fse.readJson(configPath);
+    const { org, site } = await readContentConfig(contentDir);
 
     const matrix = await git.statusMatrix({ fs, dir: contentDir });
     if (statusMatrixHasUncommitted(matrix)) {
@@ -228,7 +223,7 @@ export default class PushCommand {
 
     const token = await getValidToken(log, this._token, this._dir);
 
-    log.info(`Pushing content to da.live: ${org}/${repo}`);
+    log.info(`Pushing content to da.live: ${org}/${site}`);
     log.info(`${added.length} added, ${modified.length} modified, ${deleted.length} deleted`);
 
     const client = new DaClient(token);
@@ -236,7 +231,7 @@ export default class PushCommand {
     const shouldAbort = await this._checkConflicts(
       client,
       org,
-      repo,
+      site,
       modified,
       deleted,
       lastSyncTime,
@@ -271,12 +266,12 @@ export default class PushCommand {
     const {
       pushed: putPushed,
       errors: putErrors,
-    } = await this._uploadFiles(client, org, repo, contentDir, [...added, ...modified]);
+    } = await this._uploadFiles(client, org, site, contentDir, [...added, ...modified]);
 
     const {
       pushed: deletePushed,
       errors: deleteErrors,
-    } = await this._deleteFiles(client, org, repo, deleted);
+    } = await this._deleteFiles(client, org, site, deleted);
 
     const pushed = putPushed + deletePushed;
     const pushErrors = putErrors + deleteErrors;

package/src/content/status.cmd.js

@@ -11,9 +11,8 @@
  */
 import fs from 'fs';
 import path from 'path';
-import fse from 'fs-extra';
 import git from 'isomorphic-git';
-import { CONTENT_DIR, CONFIG_FILE } from './content-shared.js';
+import { CONTENT_DIR, readContentConfig } from './content-shared.js';
 import { resolveSyncedOid, countCommitsAhead } from './content-git.js';
 
 export default class StatusCommand {
@@ -30,14 +29,9 @@ export default class StatusCommand {
   async run() {
     const { log } = this;
     const contentDir = path.resolve(this._dir, CONTENT_DIR);
-    const configPath = path.join(contentDir, CONFIG_FILE);
+    const { org, site } = await readContentConfig(contentDir);
 
-    if (!await fse.pathExists(configPath)) {
-      throw new Error('No config found. Run \'aem content clone\' first.');
-    }
-    const { org, repo } = await fse.readJson(configPath);
-
-    log.info(`On da.live: ${org}/${repo}`);
+    log.info(`On da.live: ${org}/${site}`);
     log.info(`Local content: ./${CONTENT_DIR}/\n`);
 
     const matrix = await git.statusMatrix({ fs, dir: contentDir });