@adobe/aem-cli 16.19.14 → 16.20.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.19.14",
+  "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,13 +113,22 @@ export default class CloneCommand {
       throw new Error('Clone root path was not set (internal error).');
     }
 
-    // 1. Resolve org/site from git remote (GitHub owner/repo → da.live org/site)
-    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 org = originUrl.owner.toLowerCase();
-    const site = originUrl.repo.toLowerCase();
     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)

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();
     },