@copado/agentia-cli 0.7.0-alpha.0 → 0.9.0-alpha.0

package/README.md

@@ -23,7 +23,7 @@ $ npm install -g @copado/agentia-cli
 $ agentia COMMAND
 running command...
 $ agentia (--version)
-@copado/agentia-cli/0.7.0-alpha.0 linux-x64 node-v22.23.1
+@copado/agentia-cli/0.9.0-alpha.0 linux-x64 node-v22.23.1
 $ agentia --help [COMMAND]
 USAGE
   $ agentia COMMAND
@@ -189,6 +189,10 @@ Agentia CLI is distributed under the Copado End User License Agreement. See [LIC
 * [`agentia project default get`](#agentia-project-default-get)
 * [`agentia project default set`](#agentia-project-default-set)
 * [`agentia project default unset`](#agentia-project-default-unset)
+* [`agentia promotion conflict get ID`](#agentia-promotion-conflict-get-id)
+* [`agentia promotion conflict list`](#agentia-promotion-conflict-list)
+* [`agentia promotion conflict resolve ID`](#agentia-promotion-conflict-resolve-id)
+* [`agentia promotion conflict unresolve ID`](#agentia-promotion-conflict-unresolve-id)
 
 ## `agentia auth get`
 
@@ -220,7 +224,7 @@ EXAMPLES
   $ agentia auth get --json
 ```
 
-_See code: [src/commands/auth/get.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/auth/get.ts)_
+_See code: [src/commands/auth/get.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/auth/get.ts)_
 
 ## `agentia auth set`
 
@@ -258,7 +262,7 @@ EXAMPLES
   $ agentia auth set --cicd <copado-api-key> --region na --json
 ```
 
-_See code: [src/commands/auth/set.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/auth/set.ts)_
+_See code: [src/commands/auth/set.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/auth/set.ts)_
 
 ## `agentia environment auth status ID`
 
@@ -281,14 +285,14 @@ DESCRIPTION
   Validate the authentication status of an environment credential
 
 EXAMPLES
-  $ agentia environment auth status a0SKC000000CmZ2AU
+  $ agentia environment auth status <environment-id>
 
-  $ agentia environment auth status a0SKC000000CmZ2AU --credentialid a0kKC000000hFmWYAU
+  $ agentia environment auth status <environment-id> --credentialid <credential-id>
 
-  $ agentia environment auth status a0SKC000000CmZ2AU --json
+  $ agentia environment auth status <environment-id> --json
 ```
 
-_See code: [src/commands/environment/auth/status.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/environment/auth/status.ts)_
+_See code: [src/commands/environment/auth/status.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/environment/auth/status.ts)_
 
 ## `agentia environment auth web login ID`
 
@@ -313,16 +317,16 @@ DESCRIPTION
   Authenticate an environment credential via browser web login
 
 EXAMPLES
-  $ agentia environment auth web login a0SKC000000CmZ2AU
+  $ agentia environment auth web login <environment-id>
 
-  $ agentia environment auth web login a0SKC000000CmZ2AU --credentialid a0kKC000000hFmWYAU
+  $ agentia environment auth web login <environment-id> --credentialid <credential-id>
 
-  $ agentia environment auth web login a0SKC000000CmZ2AU --port 8085 --timeout 120
+  $ agentia environment auth web login <environment-id> --port 8085 --timeout 120
 
-  $ agentia environment auth web login a0SKC000000CmZ2AU --json
+  $ agentia environment auth web login <environment-id> --json
 ```
 
-_See code: [src/commands/environment/auth/web/login.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/environment/auth/web/login.ts)_
+_See code: [src/commands/environment/auth/web/login.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/environment/auth/web/login.ts)_
 
 ## `agentia environment create NAME`
 
@@ -367,7 +371,7 @@ EXAMPLES
   $ agentia environment create Dev --json
 ```
 
-_See code: [src/commands/environment/create.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/environment/create.ts)_
+_See code: [src/commands/environment/create.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/environment/create.ts)_
 
 ## `agentia environment get ID`
 
@@ -392,7 +396,7 @@ EXAMPLES
   $ agentia environment get a0SKC000000CmZ2AU --json
 ```
 
-_See code: [src/commands/environment/get.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/environment/get.ts)_
+_See code: [src/commands/environment/get.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/environment/get.ts)_
 
 ## `agentia environment list`
 
@@ -414,7 +418,7 @@ EXAMPLES
   $ agentia environment list --json
 ```
 
-_See code: [src/commands/environment/list.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/environment/list.ts)_
+_See code: [src/commands/environment/list.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/environment/list.ts)_
 
 ## `agentia environment update ID`
 
@@ -460,7 +464,7 @@ EXAMPLES
   $ agentia environment update a0SKC000000CmZ2AU --name UAT --json
 ```
 
-_See code: [src/commands/environment/update.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/environment/update.ts)_
+_See code: [src/commands/environment/update.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/environment/update.ts)_
 
 ## `agentia help [COMMAND]`
 
@@ -509,7 +513,7 @@ EXAMPLES
   $ agentia job get <job-id> --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/job/get.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/job/get.ts)_
+_See code: [src/commands/job/get.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/job/get.ts)_
 
 ## `agentia job kill ID`
 
@@ -538,7 +542,7 @@ EXAMPLES
   $ agentia job kill <job-id> --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/job/kill.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/job/kill.ts)_
+_See code: [src/commands/job/kill.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/job/kill.ts)_
 
 ## `agentia job list`
 
@@ -576,7 +580,7 @@ EXAMPLES
   $ agentia job list --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/job/list.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/job/list.ts)_
+_See code: [src/commands/job/list.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/job/list.ts)_
 
 ## `agentia job pause ID`
 
@@ -605,7 +609,7 @@ EXAMPLES
   $ agentia job pause <job-id> --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/job/pause.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/job/pause.ts)_
+_See code: [src/commands/job/pause.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/job/pause.ts)_
 
 ## `agentia job resume ID`
 
@@ -634,7 +638,7 @@ EXAMPLES
   $ agentia job resume <job-id> --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/job/resume.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/job/resume.ts)_
+_See code: [src/commands/job/resume.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/job/resume.ts)_
 
 ## `agentia job run ID`
 
@@ -664,7 +668,7 @@ EXAMPLES
   $ agentia job run <job-id> --user-id <id> --organization-id <id> --restart --json
 ```
 
-_See code: [src/commands/job/run.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/job/run.ts)_
+_See code: [src/commands/job/run.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/job/run.ts)_
 
 ## `agentia mcp start`
 
@@ -683,7 +687,7 @@ EXAMPLES
   $ agentia mcp start # long-running stdio MCP server for Cursor and other clients
 ```
 
-_See code: [src/commands/mcp/start.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/mcp/start.ts)_
+_See code: [src/commands/mcp/start.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/mcp/start.ts)_
 
 ## `agentia metadata content compare`
 
@@ -726,7 +730,7 @@ EXAMPLES
   $ agentia metadata content compare --metadata-type ApexClass --api-name MyClass --json
 ```
 
-_See code: [src/commands/metadata/content/compare.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/content/compare.ts)_
+_See code: [src/commands/metadata/content/compare.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/content/compare.ts)_
 
 ## `agentia metadata content get`
 
@@ -767,7 +771,7 @@ EXAMPLES
   $ agentia metadata content get --file requests.json --json
 ```
 
-_See code: [src/commands/metadata/content/get.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/content/get.ts)_
+_See code: [src/commands/metadata/content/get.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/content/get.ts)_
 
 ## `agentia metadata dependency list`
 
@@ -815,7 +819,7 @@ EXAMPLES
   $ agentia metadata dependency list --from-changes --base-ref origin/main --retrieve-mode all --pipeline-id <id> --source-org-id <id> --source-credential-id <id>
 ```
 
-_See code: [src/commands/metadata/dependency/list.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/dependency/list.ts)_
+_See code: [src/commands/metadata/dependency/list.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/dependency/list.ts)_
 
 ## `agentia metadata index compare`
 
@@ -849,7 +853,7 @@ EXAMPLES
   $ agentia metadata index compare --comparison-mode MIX --json
 ```
 
-_See code: [src/commands/metadata/index/compare.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/index/compare.ts)_
+_See code: [src/commands/metadata/index/compare.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/index/compare.ts)_
 
 ## `agentia metadata list`
 
@@ -897,7 +901,7 @@ EXAMPLES
   $ agentia metadata list --source NewAndChanged --find-managed-packages --json
 ```
 
-_See code: [src/commands/metadata/list.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/list.ts)_
+_See code: [src/commands/metadata/list.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/list.ts)_
 
 ## `agentia metadata refresh deleted`
 
@@ -929,7 +933,7 @@ EXAMPLES
   $ agentia metadata refresh deleted --env <environment-id> --user-id <id> --organization-id <id> --module-type vlocity --json
 ```
 
-_See code: [src/commands/metadata/refresh/deleted.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/refresh/deleted.ts)_
+_See code: [src/commands/metadata/refresh/deleted.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/refresh/deleted.ts)_
 
 ## `agentia metadata refresh run`
 
@@ -972,7 +976,7 @@ EXAMPLES
   $ agentia metadata refresh run --env <environment-id> --user-id <id> --organization-id <id> --all --json
 ```
 
-_See code: [src/commands/metadata/refresh/run.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/refresh/run.ts)_
+_See code: [src/commands/metadata/refresh/run.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/refresh/run.ts)_
 
 ## `agentia metadata refresh status`
 
@@ -1004,7 +1008,7 @@ EXAMPLES
   $ agentia metadata refresh status --job-id <event-id> --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/metadata/refresh/status.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/metadata/refresh/status.ts)_
+_See code: [src/commands/metadata/refresh/status.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/metadata/refresh/status.ts)_
 
 ## `agentia pipeline connection list`
 
@@ -1031,7 +1035,7 @@ EXAMPLES
   $ agentia pipeline connection list --pipeline-id <pipeline-id> --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/pipeline/connection/list.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/pipeline/connection/list.ts)_
+_See code: [src/commands/pipeline/connection/list.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/pipeline/connection/list.ts)_
 
 ## `agentia pipeline get ID`
 
@@ -1060,7 +1064,7 @@ EXAMPLES
   $ agentia pipeline get <pipeline-id> --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/pipeline/get.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/pipeline/get.ts)_
+_See code: [src/commands/pipeline/get.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/pipeline/get.ts)_
 
 ## `agentia pipeline list`
 
@@ -1086,7 +1090,7 @@ EXAMPLES
   $ agentia pipeline list --user-id <id> --organization-id <id> --json
 ```
 
-_See code: [src/commands/pipeline/list.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/pipeline/list.ts)_
+_See code: [src/commands/pipeline/list.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/pipeline/list.ts)_
 
 ## `agentia plugins`
 
@@ -1413,7 +1417,7 @@ EXAMPLES
   $ agentia project default get --json
 ```
 
-_See code: [src/commands/project/default/get.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/project/default/get.ts)_
+_See code: [src/commands/project/default/get.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/project/default/get.ts)_
 
 ## `agentia project default set`
 
@@ -1450,7 +1454,7 @@ EXAMPLES
   $ agentia project default set --project my-project --json
 ```
 
-_See code: [src/commands/project/default/set.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/project/default/set.ts)_
+_See code: [src/commands/project/default/set.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/project/default/set.ts)_
 
 ## `agentia project default unset`
 
@@ -1487,5 +1491,122 @@ EXAMPLES
   $ agentia project default unset --project --json
 ```
 
-_See code: [src/commands/project/default/unset.ts](https://github.com/Copado/agentia-cli/blob/v0.7.0-alpha.0/src/commands/project/default/unset.ts)_
+_See code: [src/commands/project/default/unset.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/project/default/unset.ts)_
+
+## `agentia promotion conflict get ID`
+
+Get raw merge-conflict content for a promotion file
+
+```
+USAGE
+  $ agentia promotion conflict get ID -p <value> [--json] [--output <value>]
+
+ARGUMENTS
+  ID  Conflict attachment Id
+
+FLAGS
+  -p, --promotion=<value>  (required) Copado promotion Id
+      --output=<value>     Write raw conflict content to this file path
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Get raw merge-conflict content for a promotion file
+
+EXAMPLES
+  $ agentia promotion conflict get <conflict-id> --promotion <promotion-id>
+
+  $ agentia promotion conflict get <conflict-id> -p <promotion-id> --output ./MyClass.cls
+
+  $ agentia promotion conflict get <conflict-id> -p <promotion-id> --json
+```
+
+_See code: [src/commands/promotion/conflict/get.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/promotion/conflict/get.ts)_
+
+## `agentia promotion conflict list`
+
+List merge conflicts for a Copado promotion
+
+```
+USAGE
+  $ agentia promotion conflict list -p <value> [--json]
+
+FLAGS
+  -p, --promotion=<value>  (required) Copado promotion Id
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  List merge conflicts for a Copado promotion
+
+EXAMPLES
+  $ agentia promotion conflict list --promotion <promotion-id>
+
+  $ agentia promotion conflict list -p <promotion-id> --json
+```
+
+_See code: [src/commands/promotion/conflict/list.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/promotion/conflict/list.ts)_
+
+## `agentia promotion conflict resolve ID`
+
+Resolve a promotion merge conflict automatically or from a file
+
+```
+USAGE
+  $ agentia promotion conflict resolve ID --mode auto|manual -p <value> [--json] [--file <value>]
+
+ARGUMENTS
+  ID  Conflict attachment Id
+
+FLAGS
+  -p, --promotion=<value>  (required) Copado promotion Id
+      --file=<value>       Path to manually resolved conflict content
+      --mode=<option>      (required) Conflict resolution mode
+                           <options: auto|manual>
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Resolve a promotion merge conflict automatically or from a file
+
+EXAMPLES
+  $ agentia promotion conflict resolve <conflict-id> --promotion <promotion-id> --mode auto
+
+  $ agentia promotion conflict resolve <conflict-id> -p <promotion-id> --mode manual --file ./MyClass.cls
+
+  $ agentia promotion conflict resolve <conflict-id> -p <promotion-id> --mode auto --json
+```
+
+_See code: [src/commands/promotion/conflict/resolve.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/promotion/conflict/resolve.ts)_
+
+## `agentia promotion conflict unresolve ID`
+
+Undo a promotion conflict resolution
+
+```
+USAGE
+  $ agentia promotion conflict unresolve ID -p <value> [--json]
+
+ARGUMENTS
+  ID  Conflict attachment Id
+
+FLAGS
+  -p, --promotion=<value>  (required) Copado promotion Id
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Undo a promotion conflict resolution
+
+EXAMPLES
+  $ agentia promotion conflict unresolve <conflict-id> --promotion <promotion-id>
+
+  $ agentia promotion conflict unresolve <conflict-id> -p <promotion-id> --json
+```
+
+_See code: [src/commands/promotion/conflict/unresolve.ts](https://github.com/Copado/agentia-cli/blob/v0.9.0-alpha.0/src/commands/promotion/conflict/unresolve.ts)_
 <!-- commandsstop -->

package/dist/commands/environment/auth/status.js

@@ -12,9 +12,9 @@ export default class EnvironmentAuthStatus extends AgentiaCommand {
     };
     static description = 'Validate the authentication status of an environment credential';
     static examples = [
-        '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU',
-        '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU --credentialid a0kKC000000hFmWYAU',
-        '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU --json',
+        '<%= config.bin %> <%= command.id %> <environment-id>',
+        '<%= config.bin %> <%= command.id %> <environment-id> --credentialid <credential-id>',
+        '<%= config.bin %> <%= command.id %> <environment-id> --json',
     ];
     static flags = {
         credentialid: Flags.string({

package/dist/commands/environment/auth/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/environment/auth/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAC,MAAM,aAAa,CAAA;AAE3C,OAAO,EAAC,cAAc,EAAC,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAEL,wBAAwB,GACzB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAA;AAE7E,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,cAAc;IAC/D,MAAM,CAAU,IAAI,GAAG;QACrB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,uBAAuB;YACpC,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IACD,MAAM,CAAU,WAAW,GAAG,iEAAiE,CAAA;IAC/F,MAAM,CAAU,QAAQ,GAAG;QACzB,uDAAuD;QACvD,yFAAyF;QACzF,8DAA8D;KAC/D,CAAA;IACD,MAAM,CAAU,KAAK,GAAG;QACtB,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,WAAW,EAAE,oEAAoE;SAClF,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QAE7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mCAAmC,EAAE,GAAG,EAAE,CAC9E,wBAAwB,CAAC;YACvB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,aAAa,EAAE,IAAI,CAAC,EAAE;SACvB,CAAC,CACH,CAAA;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,MAAM,EAAE,EAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,CAAA;IACf,CAAC"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/environment/auth/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAC,MAAM,aAAa,CAAA;AAE3C,OAAO,EAAC,cAAc,EAAC,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAEL,wBAAwB,GACzB,MAAM,yCAAyC,CAAA;AAChD,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAA;AAE7E,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,cAAc;IAC/D,MAAM,CAAU,IAAI,GAAG;QACrB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,uBAAuB;YACpC,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IACD,MAAM,CAAU,WAAW,GAAG,iEAAiE,CAAA;IAC/F,MAAM,CAAU,QAAQ,GAAG;QACzB,sDAAsD;QACtD,qFAAqF;QACrF,6DAA6D;KAC9D,CAAA;IACD,MAAM,CAAU,KAAK,GAAG;QACtB,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,WAAW,EAAE,oEAAoE;SAClF,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QAE7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mCAAmC,EAAE,GAAG,EAAE,CAC9E,wBAAwB,CAAC;YACvB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,aAAa,EAAE,IAAI,CAAC,EAAE;SACvB,CAAC,CACH,CAAA;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,MAAM,EAAE,EAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAC,CAAC,CAAC,CAAA;QACxE,CAAC,CAAC,CAAA;QAEF,OAAO,MAAM,CAAA;IACf,CAAC"}

package/dist/commands/environment/auth/web/login.js

@@ -11,10 +11,10 @@ export default class EnvironmentAuthWebLogin extends AgentiaCommand {
     };
     static description = 'Authenticate an environment credential via browser web login';
     static examples = [
-        '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU',
-        '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU --credentialid a0kKC000000hFmWYAU',
-        '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU --port 8085 --timeout 120',
-        '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU --json',
+        '<%= config.bin %> <%= command.id %> <environment-id>',
+        '<%= config.bin %> <%= command.id %> <environment-id> --credentialid <credential-id>',
+        '<%= config.bin %> <%= command.id %> <environment-id> --port 8085 --timeout 120',
+        '<%= config.bin %> <%= command.id %> <environment-id> --json',
     ];
     static flags = {
         credentialid: Flags.string({

package/dist/commands/environment/auth/web/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../../src/commands/environment/auth/web/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,oCAAoC,CAAA;AACjE,OAAO,EACL,4BAA4B,EAE5B,sBAAsB,GACvB,MAAM,qCAAqC,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,cAAc;IACjE,MAAM,CAAU,IAAI,GAAG;QACrB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,uBAAuB;YACpC,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IACD,MAAM,CAAU,WAAW,GAAG,8DAA8D,CAAA;IAC5F,MAAM,CAAU,QAAQ,GAAG;QACzB,uDAAuD;QACvD,yFAAyF;QACzF,iFAAiF;QACjF,8DAA8D;KAC/D,CAAA;IACD,MAAM,CAAU,KAAK,GAAG;QACtB,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,WAAW,EAAE,wEAAwE;SACtF,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,WAAW,EAAE,+CAA+C;SAC7D,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,4BAA4B;YACrC,WAAW,EAAE,uCAAuC;SACrD,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAE/D,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uCAAuC,EAAE,GAAG,EAAE,CAClF,sBAAsB,CAAC;gBACrB,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,aAAa,EAAE,IAAI,CAAC,EAAE;gBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE;gBACzB,cAAc,EAAE,KAAK,CAAC,OAAO;aAC9B,CAAC,CACH,CAAA;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;gBAChB,IAAI,CAAC,GAAG,CAAC,6BAA6B,MAAM,CAAC,cAAc,qBAAqB,MAAM,CAAC,aAAa,GAAG,CAAC,CAAA;YAC1G,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,EAAC,QAAQ,EAAC,GAAI,KAAqC,CAAA;YAEzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAA;YACxD,CAAC;YAED,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../../../src/commands/environment/auth/web/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,oCAAoC,CAAA;AACjE,OAAO,EACL,4BAA4B,EAE5B,sBAAsB,GACvB,MAAM,qCAAqC,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,cAAc;IACjE,MAAM,CAAU,IAAI,GAAG;QACrB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,uBAAuB;YACpC,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IACD,MAAM,CAAU,WAAW,GAAG,8DAA8D,CAAA;IAC5F,MAAM,CAAU,QAAQ,GAAG;QACzB,sDAAsD;QACtD,qFAAqF;QACrF,gFAAgF;QAChF,6DAA6D;KAC9D,CAAA;IACD,MAAM,CAAU,KAAK,GAAG;QACtB,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,WAAW,EAAE,wEAAwE;SACtF,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC;YAClB,WAAW,EAAE,+CAA+C;SAC7D,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,4BAA4B;YACrC,WAAW,EAAE,uCAAuC;SACrD,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAE/D,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uCAAuC,EAAE,GAAG,EAAE,CAClF,sBAAsB,CAAC;gBACrB,YAAY,EAAE,KAAK,CAAC,YAAY;gBAChC,aAAa,EAAE,IAAI,CAAC,EAAE;gBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE;gBACzB,cAAc,EAAE,KAAK,CAAC,OAAO;aAC9B,CAAC,CACH,CAAA;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;gBAChB,IAAI,CAAC,GAAG,CAAC,6BAA6B,MAAM,CAAC,cAAc,qBAAqB,MAAM,CAAC,aAAa,GAAG,CAAC,CAAA;YAC1G,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,EAAC,QAAQ,EAAC,GAAI,KAAqC,CAAA;YAEzD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAA;YACxD,CAAC;YAED,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC"}

package/dist/commands/promotion/conflict/get.d.ts

@@ -0,0 +1,19 @@
+import { AgentiaCommand } from '../../../lib/agentia-command.js';
+export type PromotionConflictContentResult = {
+    conflictId: string;
+    content: string;
+    output?: string;
+    promotionId: string;
+};
+export default class PromotionConflictGet extends AgentiaCommand {
+    static args: {
+        id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        output: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        promotion: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<PromotionConflictContentResult>;
+}

package/dist/commands/promotion/conflict/get.js

@@ -0,0 +1,54 @@
+import { Args, Flags } from '@oclif/core';
+import { writeFileSync } from 'node:fs';
+import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdGateway } from '../../../lib/cicd-gateway.js';
+import { promotionConflictContentEndpoint, withPromotionConflictErrorTranslation, } from '../../../lib/promotion-conflicts.js';
+export default class PromotionConflictGet extends AgentiaCommand {
+    static args = {
+        id: Args.string({
+            description: 'Conflict attachment Id',
+            required: true,
+        }),
+    };
+    static description = 'Get raw merge-conflict content for a promotion file';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> <conflict-id> --promotion <promotion-id>',
+        '<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --output ./MyClass.cls',
+        '<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --json',
+    ];
+    static flags = {
+        output: Flags.string({
+            description: 'Write raw conflict content to this file path',
+        }),
+        promotion: Flags.string({
+            char: 'p',
+            description: 'Copado promotion Id',
+            required: true,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(PromotionConflictGet);
+        const content = await this.withSpinner('Fetching promotion conflict content', () => withPromotionConflictErrorTranslation(() => CicdGateway.call({
+            endpoint: promotionConflictContentEndpoint(flags.promotion, args.id),
+            method: 'GET',
+            responseType: 'text',
+        })));
+        if (flags.output !== undefined) {
+            writeFileSync(flags.output, content, 'utf8');
+        }
+        this.display(() => {
+            if (flags.output !== undefined) {
+                this.log(`Wrote promotion conflict content to ${flags.output}.`);
+                return;
+            }
+            process.stdout.write(content);
+        });
+        return {
+            conflictId: args.id,
+            content,
+            ...(flags.output === undefined ? {} : { output: flags.output }),
+            promotionId: flags.promotion,
+        };
+    }
+}
+//# sourceMappingURL=get.js.map

package/dist/commands/promotion/conflict/get.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/commands/promotion/conflict/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,MAAM,aAAa,CAAA;AACvC,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAA;AAErC,OAAO,EAAC,cAAc,EAAC,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AACxD,OAAO,EACL,gCAAgC,EAChC,qCAAqC,GACtC,MAAM,qCAAqC,CAAA;AAS5C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,cAAc;IAC9D,MAAM,CAAU,IAAI,GAAG;QACrB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,WAAW,EAAE,wBAAwB;YACrC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IACD,MAAM,CAAU,WAAW,GAAG,qDAAqD,CAAA;IACnF,MAAM,CAAU,QAAQ,GAAG;QACzB,8EAA8E;QAC9E,4FAA4F;QAC5F,4EAA4E;KAC7E,CAAA;IACD,MAAM,CAAU,KAAK,GAAG;QACtB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,WAAW,EAAE,8CAA8C;SAC5D,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,qBAAqB;YAClC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;QAC5D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qCAAqC,EAAE,GAAG,EAAE,CACjF,qCAAqC,CAAC,GAAG,EAAE,CACzC,WAAW,CAAC,IAAI,CAAS;YACvB,QAAQ,EAAE,gCAAgC,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC;YACpE,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,MAAM;SACrB,CAAC,CACH,CACF,CAAA;QAED,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;QAC9C,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,uCAAuC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;gBAChE,OAAM;YACR,CAAC;YAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;QAEF,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,EAAE;YACnB,OAAO;YACP,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAC,CAAC;YAC7D,WAAW,EAAE,KAAK,CAAC,SAAS;SAC7B,CAAA;IACH,CAAC"}

package/dist/commands/promotion/conflict/list.d.ts

@@ -0,0 +1,10 @@
+import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { type PromotionConflict } from '../../../lib/promotion-conflicts.js';
+export default class PromotionConflictList extends AgentiaCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        promotion: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<PromotionConflict[]>;
+}

package/dist/commands/promotion/conflict/list.js

@@ -0,0 +1,35 @@
+import { Flags } from '@oclif/core';
+import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdGateway } from '../../../lib/cicd-gateway.js';
+import { formatPromotionConflictTable, normalizePromotionConflicts, promotionConflictsEndpoint, withPromotionConflictErrorTranslation, } from '../../../lib/promotion-conflicts.js';
+export default class PromotionConflictList extends AgentiaCommand {
+    static description = 'List merge conflicts for a Copado promotion';
+    static examples = [
+        '<%= config.bin %> <%= command.id %> --promotion <promotion-id>',
+        '<%= config.bin %> <%= command.id %> -p <promotion-id> --json',
+    ];
+    static flags = {
+        promotion: Flags.string({
+            char: 'p',
+            description: 'Copado promotion Id',
+            required: true,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(PromotionConflictList);
+        const response = await this.withSpinner('Fetching promotion conflicts', () => withPromotionConflictErrorTranslation(() => CicdGateway.call({
+            endpoint: promotionConflictsEndpoint(flags.promotion),
+            method: 'GET',
+        })));
+        const conflicts = normalizePromotionConflicts(response);
+        this.display(() => {
+            if (conflicts.length === 0) {
+                this.log('No promotion conflicts were found.');
+                return;
+            }
+            this.log(formatPromotionConflictTable(conflicts));
+        });
+        return conflicts;
+    }
+}
+//# sourceMappingURL=list.js.map

package/dist/commands/promotion/conflict/list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/promotion/conflict/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAC,cAAc,EAAC,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAA;AACxD,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAG3B,0BAA0B,EAC1B,qCAAqC,GACtC,MAAM,qCAAqC,CAAA;AAE5C,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,cAAc;IAC/D,MAAM,CAAU,WAAW,GAAG,6CAA6C,CAAA;IAC3E,MAAM,CAAU,QAAQ,GAAG;QACzB,gEAAgE;QAChE,8DAA8D;KAC/D,CAAA;IACD,MAAM,CAAU,KAAK,GAAG;QACtB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,qBAAqB;YAClC,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAA;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACvD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,8BAA8B,EAAE,GAAG,EAAE,CAC3E,qCAAqC,CAAC,GAAG,EAAE,CACzC,WAAW,CAAC,IAAI,CAAsD;YACpE,QAAQ,EAAE,0BAA0B,CAAC,KAAK,CAAC,SAAS,CAAC;YACrD,MAAM,EAAE,KAAK;SACd,CAAC,CACH,CACF,CAAA;QACD,MAAM,SAAS,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAA;QAEvD,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;gBAC9C,OAAM;YACR,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC,CAAA;QACnD,CAAC,CAAC,CAAA;QAEF,OAAO,SAAS,CAAA;IAClB,CAAC"}

package/dist/commands/promotion/conflict/resolve.d.ts

@@ -0,0 +1,15 @@
+import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { type PromotionConflictResolutionResult } from '../../../lib/promotion-conflicts.js';
+export default class PromotionConflictResolve extends AgentiaCommand {
+    static args: {
+        id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        file: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        mode: import("@oclif/core/interfaces").OptionFlag<"auto" | "manual", import("@oclif/core/interfaces").CustomOptions>;
+        promotion: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<PromotionConflictResolutionResult>;
+}