@adobe/aem-cli 16.19.1 → 16.19.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [16.19.3](https://github.com/adobe/helix-cli/compare/v16.19.2...v16.19.3) (2026-05-11)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#2722](https://github.com/adobe/helix-cli/issues/2722)) ([aaf998f](https://github.com/adobe/helix-cli/commit/aaf998f1d130c4a36428a3277ea9d1a516cb6050))
+
+## [16.19.2](https://github.com/adobe/helix-cli/compare/v16.19.1...v16.19.2) (2026-05-11)
+
+
+### Bug Fixes
+
+* **content:** correctness fixes for push, merge, and delete ([#2721](https://github.com/adobe/helix-cli/issues/2721)) ([efc6f11](https://github.com/adobe/helix-cli/commit/efc6f1138d55493dd546da300114df83ad006c5e))
+
 ## [16.19.1](https://github.com/adobe/helix-cli/compare/v16.19.0...v16.19.1) (2026-04-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/aem-cli",
-  "version": "16.19.1",
+  "version": "16.19.3",
   "description": "AEM CLI",
   "main": "index.js",
   "type": "module",
@@ -68,8 +68,8 @@
     "https-proxy-agent": "9.0.0",
     "ignore": "7.0.5",
     "ini": "6.0.0",
-    "isomorphic-git": "1.37.5",
-    "jose": "6.2.2",
+    "isomorphic-git": "1.37.6",
+    "jose": "6.2.3",
     "mime": "4.1.0",
     "livereload-js": "4.0.2",
     "node-diff3": "3.2.0",
@@ -95,7 +95,7 @@
     "eslint": "9.4.0",
     "esmock": "2.7.3",
     "husky": "9.1.7",
-    "junit-report-builder": "5.1.1",
+    "junit-report-builder": "5.1.2",
     "lint-staged": "16.4.0",
     "mocha": "11.7.5",
     "mocha-multi-reporters": "1.5.1",

package/src/content/da-api.js

@@ -162,7 +162,8 @@ export class DaClient {
   }
 
   /**
-   * Deletes a file or folder. Idempotent.
+   * 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}`;
@@ -173,7 +174,10 @@ export class DaClient {
     if (res.status === 401) {
       throw new Error('Unauthorized: invalid or missing token');
     }
-    return res.ok || res.status === 204;
+    if (res.ok || res.status === 204 || res.status === 404) {
+      return true;
+    }
+    throw new Error(`DELETE failed for ${daPath}: ${res.status} ${res.statusText}`);
   }
 
   /**

package/src/content/merge.cmd.js

@@ -96,7 +96,7 @@ export default class MergeCommand {
       return;
     }
 
-    const token = await getValidToken(log, this._token, contentDir);
+    const token = await getValidToken(log, this._token, this._dir);
     const client = new DaClient(token);
 
     // Get the HEAD commit to read base blobs

package/src/content/push.cmd.js

@@ -108,16 +108,16 @@ export default class PushCommand {
    * @param {string} repo
    * @param {string} contentDir
    * @param {string[]} targets
-   * @returns {Promise<{ pushed: number, errors: number, successfullyPushed: Set<string> }>}
+   * @returns {Promise<{ pushed: number, errors: number }>}
    */
   async _uploadFiles(client, org, repo, contentDir, targets) {
     const { log } = this;
     let pushed = 0;
     let errors = 0;
-    const successfullyPushed = new Set();
 
+    // processQueue consumes its input array via shift(); copy so the caller's list survives.
     const results = await processQueue(
-      targets,
+      [...targets],
       async (daPath) => {
         const localPath = path.join(contentDir, ...daPath.split('/').filter(Boolean));
         const ext = daPath.split('.').pop();
@@ -125,7 +125,7 @@ export default class PushCommand {
           const buffer = await fse.readFile(localPath);
           await client.putSource(org, repo, daPath, buffer, getContentType(ext));
           log.info(`  ✓ ${daPath}`);
-          return { ok: true, daPath };
+          return { ok: true };
         } catch (err) {
           log.warn(`  ✗ ${daPath}: ${err.message}`);
           return { ok: false };
@@ -136,13 +136,12 @@ export default class PushCommand {
     for (const r of results) {
       if (r.ok) {
         pushed += 1;
-        successfullyPushed.add(r.daPath);
       } else {
         errors += 1;
       }
     }
 
-    return { pushed, errors, successfullyPushed };
+    return { pushed, errors };
   }
 
   /**
@@ -151,21 +150,21 @@ export default class PushCommand {
    * @param {string} org
    * @param {string} repo
    * @param {string[]} deleted
-   * @returns {Promise<{ pushed: number, errors: number, successfullyDeleted: Set<string> }>}
+   * @returns {Promise<{ pushed: number, errors: number }>}
    */
   async _deleteFiles(client, org, repo, deleted) {
     const { log } = this;
     let pushed = 0;
     let errors = 0;
-    const successfullyDeleted = new Set();
 
+    // processQueue consumes its input array via shift(); copy so the caller's list survives.
     const results = await processQueue(
-      deleted,
+      [...deleted],
       async (daPath) => {
         try {
           await client.deleteSource(org, repo, daPath);
           log.info(`  ✓ deleted ${daPath}`);
-          return { ok: true, daPath };
+          return { ok: true };
         } catch (err) {
           log.warn(`  ✗ ${daPath}: ${err.message}`);
           return { ok: false };
@@ -176,13 +175,12 @@ export default class PushCommand {
     for (const r of results) {
       if (r.ok) {
         pushed += 1;
-        successfullyDeleted.add(r.daPath);
       } else {
         errors += 1;
       }
     }
 
-    return { pushed, errors, successfullyDeleted };
+    return { pushed, errors };
   }
 
   async run() {
@@ -207,12 +205,21 @@ export default class PushCommand {
     const syncedOid = await resolveSyncedOid(fs, contentDir);
     const lastSyncTime = await getCommitCommitterTimeMs(fs, contentDir, syncedOid);
 
-    let { added, modified, deleted } = await diffCommitTrees(fs, contentDir, syncedOid, headOid);
+    const fullChanges = await diffCommitTrees(fs, contentDir, syncedOid, headOid);
+
+    const scope = this._pushPath ? this._pushPath.replace(/\/+$/, '') : null;
+    const inScope = (daPath) => scope === null
+      || daPath === scope
+      || daPath.startsWith(`${scope}/`);
+    const added = fullChanges.added.filter(inScope);
+    const modified = fullChanges.modified.filter(inScope);
+    const deleted = fullChanges.deleted.filter(inScope);
 
-    const inScope = (daPath) => !this._pushPath || daPath.startsWith(this._pushPath);
-    added = added.filter(inScope);
-    modified = modified.filter(inScope);
-    deleted = deleted.filter(inScope);
+    const fullCount = fullChanges.added.length
+      + fullChanges.modified.length
+      + fullChanges.deleted.length;
+    const scopeCount = added.length + modified.length + deleted.length;
+    const scopeIsComplete = fullCount === scopeCount;
 
     if (added.length === 0 && modified.length === 0 && deleted.length === 0) {
       log.info('Nothing to push. No commits ahead of the last da.live sync.');
@@ -261,27 +268,27 @@ export default class PushCommand {
       return;
     }
 
-    const putTargets = [...added, ...modified];
     const {
       pushed: putPushed,
       errors: putErrors,
-      successfullyPushed,
-    } = await this._uploadFiles(client, org, repo, contentDir, putTargets);
+    } = await this._uploadFiles(client, org, repo, contentDir, [...added, ...modified]);
 
     const {
       pushed: deletePushed,
       errors: deleteErrors,
-      successfullyDeleted,
     } = await this._deleteFiles(client, org, repo, deleted);
 
     const pushed = putPushed + deletePushed;
     const pushErrors = putErrors + deleteErrors;
+    const allOk = pushErrors === 0;
 
-    const allPutsOk = putTargets.every((p) => successfullyPushed.has(p));
-    const allDeletesOk = deleted.every((p) => successfullyDeleted.has(p));
-
-    if (allPutsOk && allDeletesOk) {
+    if (allOk && scopeIsComplete) {
       await writeSyncedRef(fs, contentDir, headOid);
+    } else if (allOk) {
+      log.info(
+        '\n--path filter held back other changes; sync ref not advanced. '
+        + 'Run \'aem content push\' (without --path) to fully sync.',
+      );
     } else {
       log.warn('\nSync ref not updated: fix errors and push again to finish syncing this commit.');
     }