@celonis/content-cli 1.10.0 → 1.11.0

package/README.md

@@ -168,5 +168,5 @@ For details on command development, refer to the [How to Add a Command](https://
 
 Copyright (c) 2021 Celonis SE
 
-This project is licensed under the MIT License - 
+This project is licensed under the MIT License -
 see [LICENSE](https://github.com/celonis/content-cli/blob/main/LICENSE) file for details.

package/commands/asset-registry/asset-registry-api.js

@@ -13,13 +13,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../core/utils/logger"], factory);
+        define(["require", "exports", "./asset-registry-error"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.AssetRegistryApi = void 0;
-    const logger_1 = require("../../core/utils/logger");
+    const asset_registry_error_1 = require("./asset-registry-error");
     class AssetRegistryApi {
         constructor(context) {
             this.httpClient = () => context.httpClient;
@@ -28,54 +28,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             return __awaiter(this, void 0, void 0, function* () {
                 return this.httpClient()
                     .get("/pacman/api/core/asset-registry/types")
-                    .catch((e) => {
-                    throw new logger_1.FatalError(`Problem listing asset registry types: ${e}`);
-                });
+                    .catch((e) => (0, asset_registry_error_1.handleAssetRegistryApiError)("listing asset registry types", e));
+            });
+        }
+        listSkills() {
+            return __awaiter(this, void 0, void 0, function* () {
+                return this.httpClient()
+                    .get("/pacman/api/core/asset-registry/skills")
+                    .catch((e) => (0, asset_registry_error_1.handleAssetRegistryApiError)("listing asset registry skills", e));
             });
         }
         getType(assetType) {
             return __awaiter(this, void 0, void 0, function* () {
                 return this.httpClient()
                     .get(`/pacman/api/core/asset-registry/types/${encodeURIComponent(assetType)}`)
-                    .catch((e) => {
-                    throw new logger_1.FatalError(`Problem getting asset type '${assetType}': ${e}`);
-                });
+                    .catch((e) => (0, asset_registry_error_1.handleAssetRegistryApiError)(`getting asset type '${assetType}'`, e));
             });
         }
         getSchema(assetType) {
             return __awaiter(this, void 0, void 0, function* () {
                 return this.httpClient()
                     .get(`/pacman/api/core/asset-registry/schemas/${encodeURIComponent(assetType)}`)
-                    .catch((e) => {
-                    throw new logger_1.FatalError(`Problem getting schema for asset type '${assetType}': ${e}`);
-                });
+                    .catch((e) => (0, asset_registry_error_1.handleAssetRegistryApiError)(`getting schema for asset type '${assetType}'`, e));
             });
         }
         getExamples(assetType) {
             return __awaiter(this, void 0, void 0, function* () {
                 return this.httpClient()
                     .get(`/pacman/api/core/asset-registry/examples/${encodeURIComponent(assetType)}`)
-                    .catch((e) => {
-                    throw new logger_1.FatalError(`Problem getting examples for asset type '${assetType}': ${e}`);
-                });
-            });
-        }
-        getMethodology(assetType) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return this.httpClient()
-                    .get(`/pacman/api/core/asset-registry/methodologies/${encodeURIComponent(assetType)}`)
-                    .catch((e) => {
-                    throw new logger_1.FatalError(`Problem getting methodology for asset type '${assetType}': ${e}`);
-                });
+                    .catch((e) => (0, asset_registry_error_1.handleAssetRegistryApiError)(`getting examples for asset type '${assetType}'`, e));
             });
         }
         validate(assetType, body) {
             return __awaiter(this, void 0, void 0, function* () {
                 return this.httpClient()
                     .post(`/pacman/api/core/asset-registry/validate/${encodeURIComponent(assetType)}`, body)
-                    .catch((e) => {
-                    throw new logger_1.FatalError(`Problem validating asset type '${assetType}': ${e}`);
-                });
+                    .catch((e) => (0, asset_registry_error_1.handleAssetRegistryApiError)(`validating asset type '${assetType}'`, e));
             });
         }
     }

package/commands/asset-registry/asset-registry-error.js

@@ -0,0 +1,57 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "../../core/utils/logger"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.handleAssetRegistryApiError = exports.ASSET_REGISTRY_DISABLED_USER_MESSAGE = exports.ASSET_REGISTRY_DISABLED_ERROR = void 0;
+    const logger_1 = require("../../core/utils/logger");
+    exports.ASSET_REGISTRY_DISABLED_ERROR = "Asset registry feature is currently disabled";
+    exports.ASSET_REGISTRY_DISABLED_USER_MESSAGE = "Asset registry is not enabled for this team. Contact your administrator to enable the feature.";
+    function extractErrorText(error) {
+        if (typeof error === "string") {
+            return error;
+        }
+        if (error instanceof Error) {
+            return error.message;
+        }
+        return String(error);
+    }
+    function parseErrorField(error) {
+        const payload = extractJsonPayload(extractErrorText(error));
+        if (!payload) {
+            return undefined;
+        }
+        try {
+            const parsed = JSON.parse(payload);
+            return typeof parsed.error === "string" ? parsed.error : undefined;
+        }
+        catch (_a) {
+            return undefined;
+        }
+    }
+    function extractJsonPayload(text) {
+        let candidate = text.trim();
+        const fatalErrorPrefix = "FatalError: ";
+        const fatalErrorIndex = candidate.lastIndexOf(fatalErrorPrefix);
+        if (fatalErrorIndex >= 0) {
+            candidate = candidate.slice(fatalErrorIndex + fatalErrorPrefix.length).trim();
+        }
+        if (!candidate.startsWith("{")) {
+            return undefined;
+        }
+        return candidate;
+    }
+    function handleAssetRegistryApiError(operation, error) {
+        if (parseErrorField(error) === exports.ASSET_REGISTRY_DISABLED_ERROR) {
+            throw new logger_1.FatalError(exports.ASSET_REGISTRY_DISABLED_USER_MESSAGE);
+        }
+        throw new logger_1.FatalError(`Problem ${operation}: ${extractErrorText(error)}`);
+    }
+    exports.handleAssetRegistryApiError = handleAssetRegistryApiError;
+});

package/commands/asset-registry/asset-registry.service.js

@@ -48,6 +48,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
             });
         }
+        listSkills(jsonResponse) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const response = yield this.api.listSkills();
+                if (jsonResponse) {
+                    const filename = (0, uuid_1.v4)() + ".json";
+                    file_service_1.fileService.writeToFileWithGivenName(JSON.stringify(response), filename);
+                    logger_1.logger.info(file_service_1.FileService.fileDownloadedMessage + filename);
+                }
+                else {
+                    if (response.skills.length === 0) {
+                        logger_1.logger.info("No agent skills registered.");
+                        return;
+                    }
+                    response.skills.forEach((skill) => {
+                        this.logSkillSummary(skill);
+                    });
+                }
+            });
+        }
         getType(assetType, jsonResponse) {
             return __awaiter(this, void 0, void 0, function* () {
                 const descriptor = yield this.api.getType(assetType);
@@ -73,12 +92,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 this.outputResponse(data, jsonResponse);
             });
         }
-        getMethodology(assetType, jsonResponse) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const data = yield this.api.getMethodology(assetType);
-                this.outputResponse(data, jsonResponse);
-            });
-        }
         validate(opts) {
             return __awaiter(this, void 0, void 0, function* () {
                 const payload = this.buildValidatePayload(opts);
@@ -138,7 +151,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
         }
         logDescriptorSummary(descriptor) {
-            logger_1.logger.info(`${descriptor.assetType} - ${descriptor.displayName} [${descriptor.group}]`);
+            const base = `${descriptor.assetType} - ${descriptor.displayName} [${descriptor.group}]`;
+            if (descriptor.description) {
+                logger_1.logger.info(`${base} - ${descriptor.description}`);
+            }
+            else {
+                logger_1.logger.info(base);
+            }
+        }
+        logSkillSummary(skill) {
+            const base = `${skill.name} (${skill.path})`;
+            if (skill.description) {
+                logger_1.logger.info(`${base} - ${skill.description}`);
+            }
+            else {
+                logger_1.logger.info(base);
+            }
         }
         logDescriptorDetail(descriptor) {
             logger_1.logger.info(`Asset Type:   ${descriptor.assetType}`);
@@ -152,12 +180,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             logger_1.logger.info(`Endpoints:`);
             logger_1.logger.info(`  schema:     ${descriptor.endpoints.schema}`);
             logger_1.logger.info(`  validate:   ${descriptor.endpoints.validate}`);
-            if (descriptor.endpoints.methodology) {
-                logger_1.logger.info(`  methodology: ${descriptor.endpoints.methodology}`);
-            }
             if (descriptor.endpoints.examples) {
                 logger_1.logger.info(`  examples:   ${descriptor.endpoints.examples}`);
             }
+            if (descriptor.endpoints.skills) {
+                logger_1.logger.info(`  skills:     ${descriptor.endpoints.skills}`);
+            }
         }
     }
     exports.AssetRegistryService = AssetRegistryService;

package/commands/asset-registry/module.js

@@ -51,11 +51,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 .option("-f, --file <file>", "Path to a JSON file containing a full ValidateRequest body. Mutually exclusive with the build-from-options flags.")
                 .option("--json", "Return the response as a JSON file")
                 .action(this.validate);
-            assetRegistryCommand.command("methodology")
-                .description("Get the methodology / best-practices guide for an asset type")
-                .requiredOption("--assetType <assetType>", "The asset type identifier (e.g., BOARD_V2)")
+            const skillsCommand = assetRegistryCommand.command("skills")
+                .description("Discover agent skills exposed by the asset registry");
+            skillsCommand.command("list")
+                .description("List all available agent skills (name, description, path)")
                 .option("--json", "Return the response as a JSON file")
-                .action(this.getMethodology);
+                .action(this.listSkills);
         }
         listTypes(context, command, options) {
             return __awaiter(this, void 0, void 0, function* () {
@@ -89,9 +90,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 yield new asset_registry_service_1.AssetRegistryService(context).getExamples(options.assetType, !!options.json);
             });
         }
-        getMethodology(context, command, options) {
+        listSkills(context, command, options) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield new asset_registry_service_1.AssetRegistryService(context).getMethodology(options.assetType, !!options.json);
+                yield new asset_registry_service_1.AssetRegistryService(context).listSkills(!!options.json);
             });
         }
     }

package/commands/configuration-management/api/batch-import-export-api.js

@@ -24,23 +24,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         constructor(context) {
             this.httpClient = () => context.httpClient;
         }
-        findAllActivePackages(flavors, withDependencies = false) {
+        findAllActivePackages(flavors, withDependencies = false, includeBranches = false) {
             return __awaiter(this, void 0, void 0, function* () {
                 const queryParams = new URLSearchParams();
                 queryParams.set("withDependencies", withDependencies.toString());
+                queryParams.set("includeBranches", includeBranches.toString());
                 flavors.forEach(flavor => queryParams.append("flavors", flavor));
                 return this.httpClient().get(`/package-manager/api/core/packages/export/list?${queryParams.toString()}`).catch(e => {
                     throw new logger_1.FatalError(`Problem getting active packages: ${e}`);
                 });
             });
         }
-        findActivePackagesByVariableValue(flavors, variableValue, variableType) {
+        findAllStagingPackages(flavors, includeBranches = false) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const queryParams = new URLSearchParams();
+                queryParams.set("includeBranches", includeBranches.toString());
+                flavors.forEach(flavor => queryParams.append("flavors", flavor));
+                return this.httpClient().get(`/pacman/api/core/staging/packages/export/list?${queryParams.toString()}`).catch(e => {
+                    throw new logger_1.FatalError(`Problem getting staging packages: ${e}`);
+                });
+            });
+        }
+        findActivePackagesByVariableValue(flavors, variableValue, variableType, includeBranches = false) {
             return __awaiter(this, void 0, void 0, function* () {
                 const queryParams = new URLSearchParams();
                 queryParams.set("variableValue", variableValue);
                 if (variableType) {
                     queryParams.set("variableType", variableType);
                 }
+                queryParams.set("includeBranches", includeBranches.toString());
                 flavors.forEach(flavor => queryParams.append("flavors", flavor));
                 return this.httpClient().get(`/package-manager/api/core/packages/export/list-by-variable-value?${queryParams.toString()}`).catch(e => {
                     throw new logger_1.FatalError(`Problem getting active packages by variable value: ${e}`);

package/commands/configuration-management/api/node-diff-api.js

@@ -13,12 +13,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../../../core/utils/logger"], factory);
+        define(["require", "exports", "form-data", "../../../core/utils/logger"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.NodeDiffApi = void 0;
+    const FormData = require("form-data");
     const logger_1 = require("../../../core/utils/logger");
     class NodeDiffApi {
         constructor(context) {
@@ -36,6 +37,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 });
             });
         }
+        diffWithFile(request) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const queryParams = new URLSearchParams();
+                queryParams.set("baseVersion", request.baseVersion);
+                const formData = new FormData();
+                formData.append("file", request.file);
+                return this.httpClient()
+                    .postFile(`/pacman/api/core/packages/${request.packageKey}/nodes/${request.nodeKey}/diff/configuration/with-file?${queryParams.toString()}`, formData)
+                    .catch(exception => {
+                    throw new logger_1.FatalError(`Problem getting the node diff: ${exception}`);
+                });
+            });
+        }
     }
     exports.NodeDiffApi = NodeDiffApi;
 });

package/commands/configuration-management/batch-import-export.service.js

@@ -40,15 +40,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             this.studioService = new studio_service_1.StudioService(context);
             this.gitService = new git_service_1.GitService(context);
         }
-        listActivePackages(flavors) {
+        listActivePackages(flavors, includeBranches) {
             return __awaiter(this, void 0, void 0, function* () {
-                const activePackages = yield this.batchImportExportApi.findAllActivePackages(flavors);
+                const activePackages = yield this.batchImportExportApi.findAllActivePackages(flavors, false, includeBranches);
                 activePackages.forEach(pkg => {
                     logger_1.logger.info(`${pkg.name} - Key: "${pkg.key}"`);
                 });
             });
         }
-        findAndExportListOfPackages(flavors, packageKeys, keysByVersion, withDependencies) {
+        listStagingPackages(flavors, includeBranches, jsonResponse) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const stagingPackages = yield this.batchImportExportApi.findAllStagingPackages(flavors, includeBranches);
+                if (jsonResponse) {
+                    this.exportListOfPackages(stagingPackages);
+                }
+                else {
+                    stagingPackages.forEach(pkg => {
+                        logger_1.logger.info(`${pkg.name} - Key: "${pkg.key}"`);
+                    });
+                }
+            });
+        }
+        findAndExportListOfPackages(flavors, packageKeys, keysByVersion, withDependencies, includeBranches) {
             return __awaiter(this, void 0, void 0, function* () {
                 let packagesToExport;
                 if (keysByVersion.length) {
@@ -58,7 +71,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     packagesToExport = yield this.batchImportExportApi.findActivePackagesByKeys(packageKeys, withDependencies);
                 }
                 else {
-                    packagesToExport = yield this.batchImportExportApi.findAllActivePackages(flavors, withDependencies);
+                    packagesToExport = yield this.batchImportExportApi.findAllActivePackages(flavors, withDependencies, includeBranches);
                 }
                 packagesToExport = yield this.studioService.getExportPackagesWithStudioData(packagesToExport, withDependencies);
                 this.exportListOfPackages(packagesToExport);
@@ -156,16 +169,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 logger_1.logger.info("Config import report file: " + reportFileName);
             });
         }
-        findAndExportListOfActivePackagesByVariableValue(flavors, variableValue, variableType) {
+        findAndExportListOfActivePackagesByVariableValue(flavors, variableValue, variableType, includeBranches) {
             return __awaiter(this, void 0, void 0, function* () {
-                let packagesToExport = yield this.batchImportExportApi.findActivePackagesByVariableValue(flavors, variableValue, variableType);
+                let packagesToExport = yield this.batchImportExportApi.findActivePackagesByVariableValue(flavors, variableValue, variableType, includeBranches);
                 packagesToExport = yield this.studioService.getExportPackagesWithStudioData(packagesToExport, false);
                 this.exportListOfPackages(packagesToExport);
             });
         }
-        listActivePackagesByVariableValue(flavors, variableValue, variableType) {
+        listActivePackagesByVariableValue(flavors, variableValue, variableType, includeBranches) {
             return __awaiter(this, void 0, void 0, function* () {
-                const packagesByVariableValue = yield this.batchImportExportApi.findActivePackagesByVariableValue(flavors, variableValue, variableType);
+                const packagesByVariableValue = yield this.batchImportExportApi.findActivePackagesByVariableValue(flavors, variableValue, variableType, includeBranches);
                 packagesByVariableValue.forEach(pkg => {
                     logger_1.logger.info(`${pkg.name} - Key: "${pkg.key}"`);
                 });

package/commands/configuration-management/config-command.service.js

@@ -29,20 +29,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             this.variableService = new variable_service_1.VariableService(context);
             this.diffService = new diff_service_1.DiffService(context);
         }
-        listPackages(jsonResponse, flavors, withDependencies, packageKeys, keysByVersion, variableValue, variableType) {
+        listPackages(jsonResponse, flavors, withDependencies, packageKeys, keysByVersion, variableValue, variableType, includeBranches, staging) {
             return __awaiter(this, void 0, void 0, function* () {
-                if (variableValue) {
-                    yield this.listPackagesByVariableValue(jsonResponse, flavors, variableValue, variableType);
-                    return;
+                if (staging) {
+                    yield this.batchImportExportService.listStagingPackages(flavors !== null && flavors !== void 0 ? flavors : [], includeBranches, jsonResponse);
                 }
-                if (jsonResponse) {
-                    yield this.batchImportExportService.findAndExportListOfPackages(flavors !== null && flavors !== void 0 ? flavors : [], packageKeys !== null && packageKeys !== void 0 ? packageKeys : [], keysByVersion !== null && keysByVersion !== void 0 ? keysByVersion : [], withDependencies);
+                else if (variableValue) {
+                    yield this.listPackagesByVariableValue(jsonResponse, flavors, variableValue, variableType, includeBranches);
+                }
+                else if (jsonResponse) {
+                    yield this.batchImportExportService.findAndExportListOfPackages(flavors !== null && flavors !== void 0 ? flavors : [], packageKeys !== null && packageKeys !== void 0 ? packageKeys : [], keysByVersion !== null && keysByVersion !== void 0 ? keysByVersion : [], withDependencies, includeBranches);
                 }
                 else if (keysByVersion) {
                     yield this.batchImportExportService.listPackagesByKeysWithVersion(keysByVersion, withDependencies);
                 }
                 else {
-                    yield this.batchImportExportService.listActivePackages(flavors !== null && flavors !== void 0 ? flavors : []);
+                    yield this.batchImportExportService.listActivePackages(flavors !== null && flavors !== void 0 ? flavors : [], includeBranches);
                 }
             });
         }
@@ -92,13 +94,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         diffPackages(file, hasChanges, jsonResponse) {
             return this.diffService.diffPackages(file, hasChanges, jsonResponse);
         }
-        listPackagesByVariableValue(jsonResponse, flavors, variableValue, variableType) {
+        listPackagesByVariableValue(jsonResponse, flavors, variableValue, variableType, includeBranches) {
             return __awaiter(this, void 0, void 0, function* () {
                 if (jsonResponse) {
-                    yield this.batchImportExportService.findAndExportListOfActivePackagesByVariableValue(flavors !== null && flavors !== void 0 ? flavors : [], variableValue, variableType);
+                    yield this.batchImportExportService.findAndExportListOfActivePackagesByVariableValue(flavors !== null && flavors !== void 0 ? flavors : [], variableValue, variableType, includeBranches);
                 }
                 else {
-                    yield this.batchImportExportService.listActivePackagesByVariableValue(flavors !== null && flavors !== void 0 ? flavors : [], variableValue, variableType);
+                    yield this.batchImportExportService.listActivePackagesByVariableValue(flavors !== null && flavors !== void 0 ? flavors : [], variableValue, variableType, includeBranches);
                 }
             });
         }

package/commands/configuration-management/module.js

@@ -34,12 +34,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             configCommand.command("list")
                 .description("Command to list packages")
                 .option("--json", "Return response as json type", "")
-                .option("--flavors <flavors...>", "Lists only active packages of the given flavors")
+                .option("--flavors <flavors...>", "Lists only packages of the given flavors")
                 .option("--withDependencies", "Include dependencies", "")
                 .option("--packageKeys <packageKeys...>", "Lists only active versions of given package keys")
                 .option("--keysByVersion <keysByVersion...>", "Lists packages by given key and version [packageKey.version]")
                 .option("--variableValue <variableValue>", "Variable value for filtering packages by.")
                 .option("--variableType <variableType>", "Variable type for filtering packages by.")
+                .option("--branches", "Include branches", false)
+                .option("--staging", "List staging packages instead", false)
                 .action(this.listPackages);
             configCommand.command("export")
                 .description("Command to export package configs")
@@ -70,7 +72,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             configCommand.command("validate")
                 .description("Validate package node configurations")
                 .requiredOption("--packageKey <packageKey>", "Key of the package to validate")
-                .option("--layers <layers...>", "Validation layers to run", ["SCHEMA"])
+                .option("--layers <layers...>", "Validation layers to run. Allowed values: SCHEMA, BUSINESS, PACKAGE_SETTINGS (can be combined, e.g. --layers SCHEMA BUSINESS PACKAGE_SETTINGS). Defaults to SCHEMA.", ["SCHEMA"])
                 .option("--nodeKeys <nodeKeys...>", "Specific node keys to validate (default: all nodes)")
                 .option("--json", "Return the response as a JSON file")
                 .action(this.validatePackage);
@@ -153,7 +155,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 .requiredOption("--packageKey <packageKey>", "Identifier of the package")
                 .requiredOption("--nodeKey <nodeKey>", "Identifier of the node")
                 .requiredOption("--baseVersion <baseVersion>", "Base version of the node")
-                .requiredOption("--compareVersion <compareVersion>", "Compare version of the node")
+                .option("--compareVersion <compareVersion>", "Compare version of the node, mutually exclusive with --file (exactly one required)")
+                .option("-f, --file <file>", "Local node JSON file to diff against the base version, mutually exclusive with --compareVersion (exactly one required)")
                 .option("--json", "Return the response as a JSON file")
                 .action(this.diffNode);
             const nodeDependenciesCommand = nodesCommand.command("dependencies")
@@ -175,10 +178,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }
         listPackages(context, command, options) {
             return __awaiter(this, void 0, void 0, function* () {
+                if (options.staging && (options.withDependencies || options.packageKeys || options.keysByVersion || options.variableValue || options.variableType)) {
+                    throw new Error("Staging parameter is not compatible with --withDependencies, --packageKeys, --keysByVersion, --variableValue, --variableType");
+                }
                 if (options.packageKeys && options.keysByVersion) {
                     throw new Error("Please provide either --packageKeys or --keysByVersion, but not both.");
                 }
-                yield new config_command_service_1.ConfigCommandService(context).listPackages(options.json, options.flavors, options.withDependencies, options.packageKeys, options.keysByVersion, options.variableValue, options.variableType);
+                yield new config_command_service_1.ConfigCommandService(context).listPackages(options.json, options.flavors, options.withDependencies, options.packageKeys, options.keysByVersion, options.variableValue, options.variableType, options.branches, options.staging);
             });
         }
         batchExportPackages(context, command, options) {
@@ -281,7 +287,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }
         diffNode(context, command, options) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield new node_diff_service_1.NodeDiffService(context).diff(options.packageKey, options.nodeKey, options.baseVersion, options.compareVersion, options.json);
+                if ((options.file && options.compareVersion) || (!options.file && !options.compareVersion)) {
+                    throw new Error("Please provide either --compareVersion or --file, but not both.");
+                }
+                if (options.file) {
+                    yield new node_diff_service_1.NodeDiffService(context).diffWithFile(options.packageKey, options.nodeKey, options.baseVersion, options.file, options.json);
+                }
+                else {
+                    yield new node_diff_service_1.NodeDiffService(context).diff(options.packageKey, options.nodeKey, options.baseVersion, options.compareVersion, options.json);
+                }
             });
         }
         listNodeDependencies(context, command, options) {

package/commands/configuration-management/node-diff.service.js

@@ -13,12 +13,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "uuid", "../../core/utils/logger", "../../core/utils/file-service", "./api/node-diff-api"], factory);
+        define(["require", "exports", "node:fs", "uuid", "../../core/utils/logger", "../../core/utils/file-service", "./api/node-diff-api"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.NodeDiffService = void 0;
+    const fs = require("node:fs");
     const uuid_1 = require("uuid");
     const logger_1 = require("../../core/utils/logger");
     const file_service_1 = require("../../core/utils/file-service");
@@ -36,27 +37,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     compareVersion,
                 });
                 if (jsonResponse) {
-                    const filename = (0, uuid_1.v4)() + ".json";
-                    file_service_1.fileService.writeToFileWithGivenName(JSON.stringify(nodeDiff, null, 2), filename);
-                    logger_1.logger.info(file_service_1.FileService.fileDownloadedMessage + filename);
+                    this.exportDiffAsJson(nodeDiff);
                 }
                 else {
-                    logger_1.logger.info(`Package Key: ${nodeDiff.packageKey}`);
-                    logger_1.logger.info(`Node Key: ${nodeDiff.nodeKey}`);
-                    logger_1.logger.info(`Name: ${nodeDiff.name}`);
-                    logger_1.logger.info(`Type: ${nodeDiff.type}`);
-                    logger_1.logger.info(`Is invalid configuration: ${nodeDiff.invalidContent}`);
-                    if (nodeDiff.parentNodeKey) {
-                        logger_1.logger.info(`Parent Node Key: ${nodeDiff.parentNodeKey}`);
-                    }
-                    logger_1.logger.info(`Change Date: ${new Date(nodeDiff.changeDate).toISOString()}`);
-                    logger_1.logger.info(`Updated By: ${nodeDiff.updatedBy}`);
-                    logger_1.logger.info(`Change Type: ${nodeDiff.changeType}`);
-                    logger_1.logger.info(`Changes: ${JSON.stringify(nodeDiff.changes)}`);
-                    logger_1.logger.info(`Metadata Changes: ${JSON.stringify(nodeDiff.metadataChanges)}`);
+                    this.logDiff(nodeDiff);
                 }
             });
         }
+        diffWithFile(packageKey, nodeKey, baseVersion, file, jsonResponse) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const nodeDiff = yield this.nodeDiffApi.diffWithFile({
+                    packageKey,
+                    nodeKey,
+                    baseVersion,
+                    file: fs.createReadStream(file),
+                });
+                if (jsonResponse) {
+                    this.exportDiffAsJson(nodeDiff);
+                }
+                else {
+                    this.logDiff(nodeDiff);
+                }
+            });
+        }
+        exportDiffAsJson(nodeDiff) {
+            const filename = (0, uuid_1.v4)() + ".json";
+            file_service_1.fileService.writeToFileWithGivenName(JSON.stringify(nodeDiff, null, 2), filename);
+            logger_1.logger.info(file_service_1.FileService.fileDownloadedMessage + filename);
+        }
+        logDiff(nodeDiff) {
+            logger_1.logger.info(`Package Key: ${nodeDiff.packageKey}`);
+            logger_1.logger.info(`Node Key: ${nodeDiff.nodeKey}`);
+            logger_1.logger.info(`Name: ${nodeDiff.name}`);
+            logger_1.logger.info(`Type: ${nodeDiff.type}`);
+            logger_1.logger.info(`Is invalid configuration: ${nodeDiff.invalidContent}`);
+            if (nodeDiff.parentNodeKey) {
+                logger_1.logger.info(`Parent Node Key: ${nodeDiff.parentNodeKey}`);
+            }
+            logger_1.logger.info(`Change Date: ${new Date(nodeDiff.changeDate).toISOString()}`);
+            logger_1.logger.info(`Updated By: ${nodeDiff.updatedBy}`);
+            logger_1.logger.info(`Change Type: ${nodeDiff.changeType}`);
+            logger_1.logger.info(`Changes: ${JSON.stringify(nodeDiff.changes)}`);
+            logger_1.logger.info(`Metadata Changes: ${JSON.stringify(nodeDiff.metadataChanges)}`);
+        }
     }
     exports.NodeDiffService = NodeDiffService;
 });

package/commands/configuration-management/studio.service.js

@@ -13,7 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "adm-zip", "../studio/interfaces/package-manager.interfaces", "./interfaces/batch-export-import.constants", "../../core/utils/json", "../studio/api/package-api", "../studio/service/data-model.service", "../studio/api/node-api", "../studio/api/space-api", "../studio/api/studio-variables-api", "../studio/service/space.service", "../studio/service/studio-variable.service"], factory);
+        define(["require", "exports", "adm-zip", "../studio/interfaces/package-manager.interfaces", "./interfaces/batch-export-import.constants", "../../core/utils/json", "../studio/api/package-api", "../studio/service/data-model.service", "../studio/api/node-api", "../studio/api/space-api", "../studio/api/studio-variables-api", "../studio/service/space.service", "../studio/service/studio-variable.service", "../../core/utils/branches"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -30,6 +30,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     const studio_variables_api_1 = require("../studio/api/studio-variables-api");
     const space_service_1 = require("../studio/service/space.service");
     const studio_variable_service_1 = require("../studio/service/studio-variable.service");
+    const branches_1 = require("../../core/utils/branches");
     class StudioService {
         constructor(context) {
             this.studioPackageApi = new package_api_1.PackageApi(context);
@@ -89,7 +90,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
                 for (const manifest of studioManifests) {
                     const existingPackage = existingStudioPackages.find(existingPackage => existingPackage.key === manifest.packageKey);
-                    if (existingPackage) {
+                    if (existingPackage && !branches_1.BranchUtils.isBranchPackageKey(existingPackage.key)) {
                         yield this.studioPackageApi.movePackageToSpace(existingPackage.id, manifest.space.id);
                     }
                     yield this.assignRuntimeVariables(manifest);

package/core/utils/branches.js

@@ -0,0 +1,23 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.BranchUtils = void 0;
+    class BranchUtils {
+        static isBranchPackageKey(packageKey) {
+            if (!packageKey || packageKey.trim().length === 0) {
+                throw new Error("Package key cannot be empty");
+            }
+            return packageKey.includes(BranchUtils.BRANCH_SEPARATOR);
+        }
+    }
+    exports.BranchUtils = BranchUtils;
+    BranchUtils.BRANCH_SEPARATOR = "@";
+});

package/lib/commands/asset-registry/asset-registry-api.d.ts

@@ -1,12 +1,12 @@
 import { Context } from "../../core/command/cli-context";
-import { AssetRegistryDescriptor, AssetRegistryMetadata } from "./asset-registry.interfaces";
+import { AgentSkillsResponse, AssetRegistryDescriptor, AssetRegistryMetadata } from "./asset-registry.interfaces";
 export declare class AssetRegistryApi {
     private httpClient;
     constructor(context: Context);
     listTypes(): Promise<AssetRegistryMetadata>;
+    listSkills(): Promise<AgentSkillsResponse>;
     getType(assetType: string): Promise<AssetRegistryDescriptor>;
     getSchema(assetType: string): Promise<any>;
     getExamples(assetType: string): Promise<any>;
-    getMethodology(assetType: string): Promise<any>;
     validate(assetType: string, body: any): Promise<any>;
 }

package/lib/commands/asset-registry/asset-registry-error.d.ts

@@ -0,0 +1,3 @@
+export declare const ASSET_REGISTRY_DISABLED_ERROR = "Asset registry feature is currently disabled";
+export declare const ASSET_REGISTRY_DISABLED_USER_MESSAGE = "Asset registry is not enabled for this team. Contact your administrator to enable the feature.";
+export declare function handleAssetRegistryApiError(operation: string, error: unknown): never;

package/lib/commands/asset-registry/asset-registry.interfaces.d.ts

@@ -20,8 +20,8 @@ export interface AssetService {
 export interface AssetEndpoints {
     schema: string;
     validate: string;
-    methodology?: string;
     examples?: string;
+    skills?: string;
 }
 export interface AssetContributions {
     pigEntityTypes: string[];
@@ -36,3 +36,15 @@ export interface ValidateOptions {
     file?: string;
     json: boolean;
 }
+export interface AgentSkillMetadata {
+    version: string;
+}
+export interface AgentSkill {
+    name: string;
+    description: string;
+    path: string;
+    metadata: AgentSkillMetadata;
+}
+export interface AgentSkillsResponse {
+    skills: AgentSkill[];
+}

package/lib/commands/asset-registry/asset-registry.service.d.ts

@@ -4,15 +4,16 @@ export declare class AssetRegistryService {
     private api;
     constructor(context: Context);
     listTypes(jsonResponse: boolean): Promise<void>;
+    listSkills(jsonResponse: boolean): Promise<void>;
     getType(assetType: string, jsonResponse: boolean): Promise<void>;
     getSchema(assetType: string, jsonResponse: boolean): Promise<void>;
     getExamples(assetType: string, jsonResponse: boolean): Promise<void>;
-    getMethodology(assetType: string, jsonResponse: boolean): Promise<void>;
     validate(opts: ValidateOptions): Promise<void>;
     private static readonly INLINE_VALIDATION_NODE_KEY;
     private buildValidatePayload;
     private parseJson;
     private outputResponse;
     private logDescriptorSummary;
+    private logSkillSummary;
     private logDescriptorDetail;
 }

package/lib/commands/asset-registry/module.d.ts

@@ -7,6 +7,6 @@ declare class Module extends IModule {
     private getSchema;
     private validate;
     private getExamples;
-    private getMethodology;
+    private listSkills;
 }
 export = Module;

package/lib/commands/configuration-management/api/batch-import-export-api.d.ts

@@ -5,8 +5,9 @@ import { Context } from "../../../core/command/cli-context";
 export declare class BatchImportExportApi {
     private httpClient;
     constructor(context: Context);
-    findAllActivePackages(flavors: string[], withDependencies?: boolean): Promise<PackageExportTransport[]>;
-    findActivePackagesByVariableValue(flavors: string[], variableValue: string, variableType: string): Promise<PackageExportTransport[]>;
+    findAllActivePackages(flavors: string[], withDependencies?: boolean, includeBranches?: boolean): Promise<PackageExportTransport[]>;
+    findAllStagingPackages(flavors: string[], includeBranches?: boolean): Promise<PackageExportTransport[]>;
+    findActivePackagesByVariableValue(flavors: string[], variableValue: string, variableType: string, includeBranches?: boolean): Promise<PackageExportTransport[]>;
     findActivePackagesByKeys(packageKeys: string[], withDependencies?: boolean): Promise<PackageExportTransport[]>;
     findPackagesByKeysAndVersion(packageKeysWithVersion: string[], withDependencies?: boolean): Promise<PackageExportTransport[]>;
     exportPackages(packageKeys: string[], withDependencies: boolean): Promise<Buffer>;

package/lib/commands/configuration-management/api/node-diff-api.d.ts

@@ -1,7 +1,8 @@
 import { Context } from "../../../core/command/cli-context";
-import { GetNodeDiffRequest, NodeConfigurationDiffTransport } from "../interfaces/node-diff.interfaces";
+import { GetNodeDiffRequest, GetNodeDiffWithFileRequest, NodeConfigurationDiffTransport } from "../interfaces/node-diff.interfaces";
 export declare class NodeDiffApi {
     private httpClient;
     constructor(context: Context);
     diff(request: GetNodeDiffRequest): Promise<NodeConfigurationDiffTransport>;
+    diffWithFile(request: GetNodeDiffWithFileRequest): Promise<NodeConfigurationDiffTransport>;
 }

package/lib/commands/configuration-management/batch-import-export.service.d.ts

@@ -5,14 +5,15 @@ export declare class BatchImportExportService {
     private studioService;
     private gitService;
     constructor(context: Context);
-    listActivePackages(flavors: string[]): Promise<void>;
-    findAndExportListOfPackages(flavors: string[], packageKeys: string[], keysByVersion: string[], withDependencies: boolean): Promise<void>;
+    listActivePackages(flavors: string[], includeBranches: boolean): Promise<void>;
+    listStagingPackages(flavors: string[], includeBranches: boolean, jsonResponse: boolean): Promise<void>;
+    findAndExportListOfPackages(flavors: string[], packageKeys: string[], keysByVersion: string[], withDependencies: boolean, includeBranches: boolean): Promise<void>;
     listPackagesByKeysWithVersion(keysByVersion: string[], withDependencies: boolean): Promise<void>;
     batchExportPackages(packageKeys: string[], packageKeysByVersion: string[], withDependencies: boolean, gitBranch: string, unzip: boolean): Promise<void>;
     batchExportPackagesMetadata(packageKeys: string[], jsonResponse: boolean): Promise<void>;
     batchImportPackages(sourcePath: string, overwrite: boolean, gitBranch: string, performValidation?: boolean): Promise<void>;
-    findAndExportListOfActivePackagesByVariableValue(flavors: string[], variableValue: string, variableType: string): Promise<void>;
-    listActivePackagesByVariableValue(flavors: string[], variableValue: string, variableType: string): Promise<void>;
+    findAndExportListOfActivePackagesByVariableValue(flavors: string[], variableValue: string, variableType: string, includeBranches: boolean): Promise<void>;
+    listActivePackagesByVariableValue(flavors: string[], variableValue: string, variableType: string, includeBranches: boolean): Promise<void>;
     private exportListOfPackages;
     private getVersionsByPackageKey;
     private getVersionedVariablesForPackagesWithKeys;

package/lib/commands/configuration-management/config-command.service.d.ts

@@ -4,7 +4,7 @@ export declare class ConfigCommandService {
     private variableService;
     private diffService;
     constructor(context: Context);
-    listPackages(jsonResponse: boolean, flavors: string[], withDependencies: boolean, packageKeys: string[], keysByVersion: string[], variableValue: string, variableType: string): Promise<void>;
+    listPackages(jsonResponse: boolean, flavors: string[], withDependencies: boolean, packageKeys: string[], keysByVersion: string[], variableValue: string, variableType: string, includeBranches: boolean, staging: boolean): Promise<void>;
     listVariables(jsonResponse: boolean, keysByVersion: string[], keysByVersionFile: string, packageKeys: string[]): Promise<void>;
     batchExportPackages(packageKeys: string[], packageKeysByVersion: string[], withDependencies: boolean, gitBranch: string, unzip: boolean): Promise<void>;
     batchExportPackagesMetadata(packageKeys: string[], jsonResponse: boolean): Promise<void>;

package/lib/commands/configuration-management/interfaces/node-diff.interfaces.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { ReadStream } from "node:fs";
 import { ConfigurationChangeTransport, NodeConfigurationChangeType } from "./diff-package.interfaces";
 export interface GetNodeDiffRequest {
     packageKey: string;
@@ -5,6 +7,12 @@ export interface GetNodeDiffRequest {
     baseVersion: string;
     compareVersion: string;
 }
+export interface GetNodeDiffWithFileRequest {
+    packageKey: string;
+    nodeKey: string;
+    baseVersion: string;
+    file: ReadStream;
+}
 export interface NodeConfigurationDiffTransport {
     packageKey: string;
     nodeKey: string;

package/lib/commands/configuration-management/node-diff.service.d.ts

@@ -3,4 +3,7 @@ export declare class NodeDiffService {
     private nodeDiffApi;
     constructor(context: Context);
     diff(packageKey: string, nodeKey: string, baseVersion: string, compareVersion: string, jsonResponse: boolean): Promise<void>;
+    diffWithFile(packageKey: string, nodeKey: string, baseVersion: string, file: string, jsonResponse: boolean): Promise<void>;
+    private exportDiffAsJson;
+    private logDiff;
 }

package/lib/core/utils/branches.d.ts

@@ -0,0 +1,4 @@
+export declare class BranchUtils {
+    private static readonly BRANCH_SEPARATOR;
+    static isBranchPackageKey(packageKey: string): boolean;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celonis/content-cli",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "CLI Tool to help manage content in Celonis Platform",
   "main": "content-cli.js",
   "bin": {