@copado/agentia-cli 0.58.0-alpha.0 → 0.60.0-alpha.0

package/oclif.manifest.json

@@ -92,31 +92,6 @@
         "update.js"
       ]
     },
-    "mcp:start": {
-      "aliases": [],
-      "args": {},
-      "description": "Start the local Agentia MCP server over stdio",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> # long-running stdio MCP server for Cursor and other clients"
-      ],
-      "flags": {},
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "mcp:start",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "mcp",
-        "start.js"
-      ]
-    },
     "auth:get": {
       "aliases": [],
       "args": {},
@@ -361,6 +336,31 @@
         "unset.js"
       ]
     },
+    "mcp:start": {
+      "aliases": [],
+      "args": {},
+      "description": "Start the local Agentia MCP server over stdio",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> # long-running stdio MCP server for Cursor and other clients"
+      ],
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "mcp:start",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "mcp",
+        "start.js"
+      ]
+    },
     "testing:create": {
       "aliases": [],
       "args": {},
@@ -3290,150 +3290,6 @@
         "open.js"
       ]
     },
-    "cicd:project:get": {
-      "aliases": [],
-      "args": {
-        "id": {
-          "description": "Copado project ID",
-          "name": "id",
-          "required": true
-        }
-      },
-      "description": "Get a Copado project by ID",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> <project-id>",
-        "<%= config.bin %> <%= command.id %> <project-id> --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:project:get",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "project",
-        "get.js"
-      ]
-    },
-    "cicd:project:list": {
-      "aliases": [],
-      "args": {},
-      "description": "List Copado projects",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --mine",
-        "<%= config.bin %> <%= command.id %> --name Gateway",
-        "<%= config.bin %> <%= command.id %> --mine --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "cursor": {
-          "description": "Opaque pagination cursor from a previous list response (nextCursor)",
-          "name": "cursor",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "page-size": {
-          "description": "Number of records per page (1-200)",
-          "name": "page-size",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "mine": {
-          "description": "List only projects owned by or related to the current user",
-          "name": "mine",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "name": {
-          "description": "Filter by name (partial match)",
-          "name": "name",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:project:list",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "project",
-        "list.js"
-      ]
-    },
-    "cicd:project:open": {
-      "aliases": [],
-      "args": {
-        "id": {
-          "description": "Copado project ID (defaults to the configured project default)",
-          "name": "id",
-          "required": false
-        }
-      },
-      "description": "Open a Copado project in the browser",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> a0wKC000000CmZ2AU",
-        "<%= config.bin %> <%= command.id %> a0wKC000000CmZ2AU --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:project:open",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "project",
-        "open.js"
-      ]
-    },
     "cicd:promotion:get": {
       "aliases": [],
       "args": {
@@ -3760,19 +3616,19 @@
         "run.js"
       ]
     },
-    "cicd:repository:create": {
+    "cicd:project:get": {
       "aliases": [],
       "args": {
-        "name": {
-          "description": "Name of the Copado Git repository to create",
-          "name": "name",
+        "id": {
+          "description": "Copado project ID",
+          "name": "id",
           "required": true
         }
       },
-      "description": "Create a Copado Git repository",
+      "description": "Get a Copado project by ID",
       "examples": [
-        "<%= config.bin %> <%= command.id %> my-repo --source-format DX --provider Github --uri https://github.com/org/repo.git",
-        "<%= config.bin %> <%= command.id %> my-repo --source-format DX --provider Gitlab --json"
+        "<%= config.bin %> <%= command.id %> <project-id>",
+        "<%= config.bin %> <%= command.id %> <project-id> --json"
       ],
       "flags": {
         "json": {
@@ -3781,21 +3637,165 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "allow-functions-git-cache": {
-          "description": "Allow Functions Git cache for this repository",
-          "name": "allow-functions-git-cache",
-          "allowNo": true,
-          "type": "boolean"
-        },
-        "copado-tunnel-enabled": {
-          "description": "Enable Copado tunnel for this repository",
-          "name": "copado-tunnel-enabled",
-          "allowNo": true,
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:project:get",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "project",
+        "get.js"
+      ]
+    },
+    "cicd:project:list": {
+      "aliases": [],
+      "args": {},
+      "description": "List Copado projects",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --mine",
+        "<%= config.bin %> <%= command.id %> --name Gateway",
+        "<%= config.bin %> <%= command.id %> --mine --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
           "type": "boolean"
         },
-        "auth-type": {
-          "description": "Repository authentication type",
+        "cursor": {
+          "description": "Opaque pagination cursor from a previous list response (nextCursor)",
+          "name": "cursor",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "page-size": {
+          "description": "Number of records per page (1-200)",
+          "name": "page-size",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "mine": {
+          "description": "List only projects owned by or related to the current user",
+          "name": "mine",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "name": {
+          "description": "Filter by name (partial match)",
+          "name": "name",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:project:list",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "project",
+        "list.js"
+      ]
+    },
+    "cicd:project:open": {
+      "aliases": [],
+      "args": {
+        "id": {
+          "description": "Copado project ID (defaults to the configured project default)",
+          "name": "id",
+          "required": false
+        }
+      },
+      "description": "Open a Copado project in the browser",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> a0wKC000000CmZ2AU",
+        "<%= config.bin %> <%= command.id %> a0wKC000000CmZ2AU --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:project:open",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "project",
+        "open.js"
+      ]
+    },
+    "cicd:repository:create": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "Name of the Copado Git repository to create",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "Create a Copado Git repository",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> my-repo --source-format DX --provider Github --uri https://github.com/org/repo.git",
+        "<%= config.bin %> <%= command.id %> my-repo --source-format DX --provider Gitlab --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "allow-functions-git-cache": {
+          "description": "Allow Functions Git cache for this repository",
+          "name": "allow-functions-git-cache",
+          "allowNo": true,
+          "type": "boolean"
+        },
+        "copado-tunnel-enabled": {
+          "description": "Enable Copado tunnel for this repository",
+          "name": "copado-tunnel-enabled",
+          "allowNo": true,
+          "type": "boolean"
+        },
+        "auth-type": {
+          "description": "Repository authentication type",
           "name": "auth-type",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -10313,90 +10313,6 @@
         "get.js"
       ]
     },
-    "cicd:metadata:index:compare": {
-      "aliases": [],
-      "args": {},
-      "description": "Compare metadata between orgs or Git branches",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> --comparison-mode BRANCH_COMPARE --pipeline-id <id> --source-org-id <id> --source-credential-id <id> --target-org-id <id>",
-        "<%= config.bin %> <%= command.id %> --comparison-mode INDEX_FILE --filter-type ApexClass --pipeline-id <id> --source-org-id <id> --source-credential-id <id> --target-org-id <id>",
-        "<%= config.bin %> <%= command.id %> --comparison-mode MIX --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "comparison-mode": {
-          "description": "Comparison mode",
-          "name": "comparison-mode",
-          "default": "BRANCH_COMPARE",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "BRANCH_COMPARE",
-            "INDEX_FILE",
-            "MIX"
-          ],
-          "type": "option"
-        },
-        "filter-type": {
-          "description": "Optional metadata type filter, for example ApexClass",
-          "name": "filter-type",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "pipeline-id": {
-          "description": "Pipeline Id",
-          "name": "pipeline-id",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "source-credential-id": {
-          "description": "Source org credential Id",
-          "name": "source-credential-id",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "source-org-id": {
-          "description": "Source org Id",
-          "name": "source-org-id",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "target-org-id": {
-          "description": "Target org Id",
-          "name": "target-org-id",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:metadata:index:compare",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "metadata",
-        "index",
-        "compare.js"
-      ]
-    },
     "cicd:metadata:dependency:list": {
       "aliases": [],
       "args": {},
@@ -10560,13 +10476,14 @@
         "list.js"
       ]
     },
-    "cicd:metadata:refresh:deleted": {
+    "cicd:metadata:index:compare": {
       "aliases": [],
       "args": {},
-      "description": "Refresh the deleted metadata index via the CICD gateway",
+      "description": "Compare metadata between orgs or Git branches",
       "examples": [
-        "<%= config.bin %> <%= command.id %> --env <environment-id>",
-        "<%= config.bin %> <%= command.id %> --env <environment-id> --module-type vlocity --json"
+        "<%= config.bin %> <%= command.id %> --comparison-mode BRANCH_COMPARE --pipeline-id <id> --source-org-id <id> --source-credential-id <id> --target-org-id <id>",
+        "<%= config.bin %> <%= command.id %> --comparison-mode INDEX_FILE --filter-type ApexClass --pipeline-id <id> --source-org-id <id> --source-credential-id <id> --target-org-id <id>",
+        "<%= config.bin %> <%= command.id %> --comparison-mode MIX --json"
       ],
       "flags": {
         "json": {
@@ -10576,42 +10493,125 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "env": {
-          "description": "Copado environment Id used to resolve the credential",
-          "name": "env",
+        "comparison-mode": {
+          "description": "Comparison mode",
+          "name": "comparison-mode",
+          "default": "BRANCH_COMPARE",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "BRANCH_COMPARE",
+            "INDEX_FILE",
+            "MIX"
+          ],
+          "type": "option"
+        },
+        "filter-type": {
+          "description": "Optional metadata type filter, for example ApexClass",
+          "name": "filter-type",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "module-type": {
-          "description": "Optional addon module type",
-          "name": "module-type",
+        "pipeline-id": {
+          "description": "Pipeline Id",
+          "name": "pipeline-id",
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "vlocity",
-            "data_cloud"
-          ],
           "type": "option"
         },
         "source-credential-id": {
-          "description": "Override source credential Id resolved from --env",
+          "description": "Source org credential Id",
           "name": "source-credential-id",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "source-org-id": {
-          "description": "Override source org Id resolved from --env validation",
+          "description": "Source org Id",
           "name": "source-org-id",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "target-org-id": {
+          "description": "Target org Id",
+          "name": "target-org-id",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "cicd:metadata:refresh:deleted",
+      "id": "cicd:metadata:index:compare",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "metadata",
+        "index",
+        "compare.js"
+      ]
+    },
+    "cicd:metadata:refresh:deleted": {
+      "aliases": [],
+      "args": {},
+      "description": "Refresh the deleted metadata index via the CICD gateway",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> --env <environment-id>",
+        "<%= config.bin %> <%= command.id %> --env <environment-id> --module-type vlocity --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "env": {
+          "description": "Copado environment Id used to resolve the credential",
+          "name": "env",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "module-type": {
+          "description": "Optional addon module type",
+          "name": "module-type",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "vlocity",
+            "data_cloud"
+          ],
+          "type": "option"
+        },
+        "source-credential-id": {
+          "description": "Override source credential Id resolved from --env",
+          "name": "source-credential-id",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "source-org-id": {
+          "description": "Override source org Id resolved from --env validation",
+          "name": "source-org-id",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:metadata:refresh:deleted",
       "pluginAlias": "@copado/agentia-cli",
       "pluginName": "@copado/agentia-cli",
       "pluginType": "core",
@@ -10866,6 +10866,228 @@
         "list.js"
       ]
     },
+    "cicd:promotion:conflict:get": {
+      "aliases": [],
+      "args": {
+        "id": {
+          "description": "Conflict attachment Id",
+          "name": "id",
+          "required": true
+        }
+      },
+      "description": "Get raw merge-conflict content for a promotion file",
+      "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"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "output": {
+          "description": "Write raw conflict content to this file path",
+          "name": "output",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "promotion": {
+          "char": "p",
+          "description": "Copado promotion Id",
+          "name": "promotion",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:promotion:conflict:get",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "promotion",
+        "conflict",
+        "get.js"
+      ]
+    },
+    "cicd:promotion:conflict:list": {
+      "aliases": [],
+      "args": {},
+      "description": "List merge conflicts for a Copado promotion",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> --promotion <promotion-id>",
+        "<%= config.bin %> <%= command.id %> -p <promotion-id> --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "promotion": {
+          "char": "p",
+          "description": "Copado promotion Id",
+          "name": "promotion",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:promotion:conflict:list",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "promotion",
+        "conflict",
+        "list.js"
+      ]
+    },
+    "cicd:promotion:conflict:resolve": {
+      "aliases": [],
+      "args": {
+        "id": {
+          "description": "Conflict attachment Id",
+          "name": "id",
+          "required": true
+        }
+      },
+      "description": "Resolve a promotion merge conflict automatically or from a file",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> <conflict-id> --promotion <promotion-id> --mode auto",
+        "<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --mode manual --file ./MyClass.cls",
+        "<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --mode auto --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "file": {
+          "description": "Path to manually resolved conflict content",
+          "name": "file",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "mode": {
+          "description": "Conflict resolution mode",
+          "name": "mode",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "auto",
+            "manual"
+          ],
+          "type": "option"
+        },
+        "promotion": {
+          "char": "p",
+          "description": "Copado promotion Id",
+          "name": "promotion",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:promotion:conflict:resolve",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "promotion",
+        "conflict",
+        "resolve.js"
+      ]
+    },
+    "cicd:promotion:conflict:unresolve": {
+      "aliases": [],
+      "args": {
+        "id": {
+          "description": "Conflict attachment Id",
+          "name": "id",
+          "required": true
+        }
+      },
+      "description": "Undo a promotion conflict resolution",
+      "examples": [
+        "<%= config.bin %> <%= command.id %> <conflict-id> --promotion <promotion-id>",
+        "<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "promotion": {
+          "char": "p",
+          "description": "Copado promotion Id",
+          "name": "promotion",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "cicd:promotion:conflict:unresolve",
+      "pluginAlias": "@copado/agentia-cli",
+      "pluginName": "@copado/agentia-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "cicd",
+        "promotion",
+        "conflict",
+        "unresolve.js"
+      ]
+    },
     "cicd:project:default:get": {
       "aliases": [],
       "args": {},
@@ -11146,228 +11368,6 @@
         "unset.js"
       ]
     },
-    "cicd:promotion:conflict:get": {
-      "aliases": [],
-      "args": {
-        "id": {
-          "description": "Conflict attachment Id",
-          "name": "id",
-          "required": true
-        }
-      },
-      "description": "Get raw merge-conflict content for a promotion file",
-      "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"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "output": {
-          "description": "Write raw conflict content to this file path",
-          "name": "output",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "promotion": {
-          "char": "p",
-          "description": "Copado promotion Id",
-          "name": "promotion",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:promotion:conflict:get",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "promotion",
-        "conflict",
-        "get.js"
-      ]
-    },
-    "cicd:promotion:conflict:list": {
-      "aliases": [],
-      "args": {},
-      "description": "List merge conflicts for a Copado promotion",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> --promotion <promotion-id>",
-        "<%= config.bin %> <%= command.id %> -p <promotion-id> --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "promotion": {
-          "char": "p",
-          "description": "Copado promotion Id",
-          "name": "promotion",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:promotion:conflict:list",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "promotion",
-        "conflict",
-        "list.js"
-      ]
-    },
-    "cicd:promotion:conflict:resolve": {
-      "aliases": [],
-      "args": {
-        "id": {
-          "description": "Conflict attachment Id",
-          "name": "id",
-          "required": true
-        }
-      },
-      "description": "Resolve a promotion merge conflict automatically or from a file",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> <conflict-id> --promotion <promotion-id> --mode auto",
-        "<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --mode manual --file ./MyClass.cls",
-        "<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --mode auto --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "file": {
-          "description": "Path to manually resolved conflict content",
-          "name": "file",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "mode": {
-          "description": "Conflict resolution mode",
-          "name": "mode",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "auto",
-            "manual"
-          ],
-          "type": "option"
-        },
-        "promotion": {
-          "char": "p",
-          "description": "Copado promotion Id",
-          "name": "promotion",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:promotion:conflict:resolve",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "promotion",
-        "conflict",
-        "resolve.js"
-      ]
-    },
-    "cicd:promotion:conflict:unresolve": {
-      "aliases": [],
-      "args": {
-        "id": {
-          "description": "Conflict attachment Id",
-          "name": "id",
-          "required": true
-        }
-      },
-      "description": "Undo a promotion conflict resolution",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> <conflict-id> --promotion <promotion-id>",
-        "<%= config.bin %> <%= command.id %> <conflict-id> -p <promotion-id> --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "promotion": {
-          "char": "p",
-          "description": "Copado promotion Id",
-          "name": "promotion",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "cicd:promotion:conflict:unresolve",
-      "pluginAlias": "@copado/agentia-cli",
-      "pluginName": "@copado/agentia-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "cicd",
-        "promotion",
-        "conflict",
-        "unresolve.js"
-      ]
-    },
     "cicd:environment:auth:web:login": {
       "aliases": [],
       "args": {
@@ -11485,5 +11485,5 @@
       ]
     }
   },
-  "version": "0.58.0-alpha.0"
+  "version": "0.60.0-alpha.0"
 }