npm - sfdx-hardis - Versions diffs - 5.25.1 → 5.26.0 - Mend

sfdx-hardis 5.25.1 → 5.26.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/CHANGELOG.md +8 -0
package/lib/commands/hardis/org/monitor/backup.js +2 -0
package/lib/commands/hardis/org/monitor/backup.js.map +1 -1
package/lib/common/utils/gitUtils.js +5 -1
package/lib/common/utils/gitUtils.js.map +1 -1
package/lib/common/utils/index.js +21 -2
package/lib/common/utils/index.js.map +1 -1
package/oclif.manifest.json +974 -974
package/package.json +1 -1

package/oclif.manifest.json CHANGED Viewed

@@ -57,12 +57,13 @@
         "world:hello"
       ]
     },
-    "hardis:cache:clear": {
+    "hardis:auth:login": {
       "aliases": [],
       "args": {},
-      "description": "Clear cache generated by sfdx-hardis",
+      "description": "Login to salesforce org",
       "examples": [
-        "$ sf hardis:cache:clear"
+        "$ sf hardis:auth:login",
+        "CI=true sf hardis:auth:login"
       ],
       "flags": {
         "json": {
@@ -80,6 +81,28 @@
           "multiple": false,
           "type": "option"
         },
+        "instanceurl": {
+          "char": "r",
+          "description": "URL of org instance",
+          "name": "instanceurl",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "devhub": {
+          "char": "h",
+          "description": "Also connect associated DevHub",
+          "name": "devhub",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "scratchorg": {
+          "char": "s",
+          "description": "Scratch org",
+          "name": "scratchorg",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -103,39 +126,38 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:cache:clear",
+      "id": "hardis:auth:login",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Clear sfdx-hardis cache",
+      "title": "Login",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "cache",
-        "clear.js"
+        "auth",
+        "login.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:cache:clear",
-        "cache:hardis:clear",
-        "cache:clear:hardis",
-        "hardis:clear:cache",
-        "clear:hardis:cache",
-        "clear:cache:hardis"
+        "hardis:auth:login",
+        "auth:hardis:login",
+        "auth:login:hardis",
+        "hardis:login:auth",
+        "login:hardis:auth",
+        "login:auth:hardis"
       ]
     },
-    "hardis:auth:login": {
+    "hardis:cache:clear": {
       "aliases": [],
       "args": {},
-      "description": "Login to salesforce org",
+      "description": "Clear cache generated by sfdx-hardis",
       "examples": [
-        "$ sf hardis:auth:login",
-        "CI=true sf hardis:auth:login"
+        "$ sf hardis:cache:clear"
       ],
       "flags": {
         "json": {
@@ -153,28 +175,6 @@
           "multiple": false,
           "type": "option"
         },
-        "instanceurl": {
-          "char": "r",
-          "description": "URL of org instance",
-          "name": "instanceurl",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "devhub": {
-          "char": "h",
-          "description": "Also connect associated DevHub",
-          "name": "devhub",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "scratchorg": {
-          "char": "s",
-          "description": "Scratch org",
-          "name": "scratchorg",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -198,30 +198,30 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:auth:login",
+      "id": "hardis:cache:clear",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Login",
+      "title": "Clear sfdx-hardis cache",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "auth",
-        "login.js"
+        "cache",
+        "clear.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:auth:login",
-        "auth:hardis:login",
-        "auth:login:hardis",
-        "hardis:login:auth",
-        "login:hardis:auth",
-        "login:auth:hardis"
+        "hardis:cache:clear",
+        "cache:hardis:clear",
+        "cache:clear:hardis",
+        "hardis:clear:cache",
+        "clear:hardis:cache",
+        "clear:cache:hardis"
       ]
     },
     "hardis:config:get": {
@@ -2729,12 +2729,12 @@
         "lint:project:hardis"
       ]
     },
-    "hardis:scratch:create": {
+    "hardis:source:deploy": {
       "aliases": [],
       "args": {},
-      "description": "Create and initialize a scratch org or a source-tracked sandbox (config can be defined using `config/.sfdx-hardis.yml`):\n\n- **Install packages**\n  - Use property `installedPackages`\n- **Push sources**\n- **Assign permission sets**\n  - Use property `initPermissionSets`\n- **Run apex initialization scripts**\n  - Use property `scratchOrgInitApexScripts`\n- **Load data**\n  - Use property `dataPackages`\n  ",
+      "description": "sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.\n\nAdditional to the base command wrapper: If using **--checkonly**, add options **--checkcoverage** and **--coverageformatters json-summary** to check that org coverage is > 75% (or value defined in .sfdx-hardis.yml property **apexTestsMinCoverageOrgWide**)\n\n### Deployment results\n\nYou can also have deployment results as pull request comments, on:\n\n- GitHub (see [GitHub Pull Requests comments config](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-github/))\n- Gitlab (see [Gitlab integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-gitlab/))\n- Azure DevOps (see [Azure integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-azure/))\n\n\n[![Assisted solving of Salesforce deployments errors](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deployment-errors.jpg)](https://nicolas.vuillamy.fr/assisted-solving-of-salesforce-deployments-errors-47f3666a9ed0)\n\n### Deployment pre or post commands\n\nYou can define command lines to run before or after a deployment, with parameters:\n\n- **id**: Unique Id for the command\n- **label**: Human readable label for the command\n- **skipIfError**: If defined to \"true\", the post-command won't be run if there is a deployment failure\n- **context**: Defines the context where the command will be run. Can be **all** (default), **check-deployment-only** or **process-deployment-only**\n- **runOnlyOnceByOrg**: If set to true, the command will be run only one time per org. A record of SfdxHardisTrace__c is stored to make that possible (it needs to be existing in target org)\n\nIf the commands are not the same depending on the target org, you can define them into **config/branches/.sfdx-hardis-BRANCHNAME.yml** instead of root **config/.sfdx-hardis.yml**\n\nExample:\n\n```yaml\ncommandsPreDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to the deployment user\n    command: sf data update record --sobject User --where \"Username='deploy.github@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n\ncommandsPostDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to desired username\n    command: sf data update record --sobject User --where \"Username='admin-yser@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n  - id: someActionToRunJustOneTime\n    label: And to run only if deployment is success\n    command: sf sfdmu:run ...\n    skipIfError: true\n    context: process-deployment-only\n    runOnlyOnceByOrg: true\n```\n\nNotes:\n\n- You can disable coloring of errors in red by defining env variable SFDX_HARDIS_DEPLOY_ERR_COLORS=false\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy)\n",
       "examples": [
-        "$ sf hardis:scratch:create"
+        "$ sf hardis:source:deploy -x manifest/package.xml --wait 60 --ignorewarnings --testlevel RunLocalTests --postdestructivechanges ./manifest/destructiveChanges.xml --target-org nicolas.vuillamy@cloudity.com.sfdxhardis --checkonly --checkcoverage --verbose --coverageformatters json-summary"
       ],
       "flags": {
         "json": {
@@ -2752,214 +2752,205 @@
           "multiple": false,
           "type": "option"
         },
-        "forcenew": {
-          "char": "n",
-          "description": "If an existing scratch org exists, do not reuse it but create a new one",
-          "name": "forcenew",
+        "checkonly": {
+          "char": "c",
+          "description": "checkonly",
+          "name": "checkonly",
           "allowNo": false,
           "type": "boolean"
         },
-        "pool": {
-          "description": "Creates the scratch org for a scratch org pool",
-          "name": "pool",
+        "soapdeploy": {
+          "description": "soapDeploy",
+          "name": "soapdeploy",
           "allowNo": false,
           "type": "boolean"
         },
-        "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
+        "wait": {
+          "char": "w",
+          "description": "wait",
+          "name": "wait",
+          "default": 60,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
-          "name": "websocket",
+        "testlevel": {
+          "char": "l",
+          "description": "testlevel",
+          "name": "testlevel",
+          "default": "NoTestRun",
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "NoTestRun",
+            "RunSpecifiedTests",
+            "RunLocalTests",
+            "RunAllTestsInOrg"
+          ],
           "type": "option"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
+        "runtests": {
+          "char": "r",
+          "description": "runTests",
+          "name": "runtests",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "ignoreerrors": {
+          "description": "ignoreErrors",
+          "name": "ignoreerrors",
           "allowNo": false,
           "type": "boolean"
         },
-        "target-dev-hub": {
-          "aliases": [
-            "targetdevhubusername"
-          ],
-          "char": "v",
-          "deprecateAliases": true,
-          "name": "target-dev-hub",
-          "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the Dev Hub org. Not required if the `target-dev-hub` configuration variable is already set.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": true,
-      "hiddenAliases": [],
-      "id": "hardis:scratch:create",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Create and initialize scratch org",
-      "requiresProject": true,
-      "requiresSfdxPlugins": [
-        "sfdmu",
-        "texei-sfdx-plugin"
-      ],
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "scratch",
-        "create.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:scratch:create",
-        "scratch:hardis:create",
-        "scratch:create:hardis",
-        "hardis:create:scratch",
-        "create:hardis:scratch",
-        "create:scratch:hardis"
-      ]
-    },
-    "hardis:scratch:delete": {
-      "aliases": [],
-      "args": {},
-      "description": "Assisted menu to delete scratch orgs associated to a DevHub",
-      "examples": [
-        "$ sf hardis:scratch:delete"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
+        "ignorewarnings": {
+          "char": "g",
+          "description": "ignoreWarnings",
+          "name": "ignorewarnings",
           "allowNo": false,
           "type": "boolean"
         },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
+        "validateddeployrequestid": {
+          "char": "q",
+          "description": "validateDeployRequestId",
+          "exclusive": [
+            "manifest",
+            "metadata",
+            "sourcepath",
+            "checkonly",
+            "testlevel",
+            "runtests",
+            "ignoreerrors",
+            "ignorewarnings"
+          ],
+          "name": "validateddeployrequestid",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
-          "name": "debug",
+        "verbose": {
+          "description": "verbose",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
         },
-        "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
-          "name": "websocket",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
-          "allowNo": false,
-          "type": "boolean"
+        "metadata": {
+          "char": "m",
+          "description": "metadata",
+          "exclusive": [
+            "manifest",
+            "sourcepath"
+          ],
+          "name": "metadata",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
         },
-        "target-dev-hub": {
-          "aliases": [
-            "targetdevhubusername"
+        "sourcepath": {
+          "char": "p",
+          "description": "sourcePath",
+          "exclusive": [
+            "manifest",
+            "metadata"
           ],
-          "char": "v",
-          "deprecateAliases": true,
-          "name": "target-dev-hub",
-          "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the Dev Hub org. Not required if the `target-dev-hub` configuration variable is already set.",
-          "hasDynamicHelp": true,
+          "name": "sourcepath",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "manifest": {
+          "char": "x",
+          "description": "flagsLong.manifest",
+          "exclusive": [
+            "metadata",
+            "sourcepath"
+          ],
+          "name": "manifest",
+          "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        }
-      },
-      "hasDynamicHelp": true,
-      "hiddenAliases": [],
-      "id": "hardis:scratch:delete",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Delete scratch orgs(s)",
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "scratch",
-        "delete.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:scratch:delete",
-        "scratch:hardis:delete",
-        "scratch:delete:hardis",
-        "hardis:delete:scratch",
-        "delete:hardis:scratch",
-        "delete:scratch:hardis"
-      ]
-    },
-    "hardis:scratch:pull": {
-      "aliases": [],
-      "args": {},
-      "description": "This commands pulls the updates you performed in your scratch or sandbox org, into your local files\n\nThen, you probably want to stage and commit the files containing the updates you want to keep, as explained in this video.\n\n<iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/Ik6whtflmfY\" title=\"YouTube video player\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>\n\n- Calls `sf project retrieve start` under the hood\n- If there are errors, proposes to automatically add erroneous item in `.forceignore`, then pull again\n- If you don't see your updated items in the results, you can manually retrieve [using SF Extension **Org Browser** or **Salesforce CLI**](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-publish-task/#retrieve-metadatas)\n- If you want to always retrieve sources like CustomApplication that are not always detected as updates by project:retrieve:start , you can define property **autoRetrieveWhenPull** in .sfdx-hardis.yml\n\nExample:\n```yaml\nautoRetrieveWhenPull:\n  - CustomApplication:MyCustomApplication\n  - CustomApplication:MyOtherCustomApplication\n  - CustomApplication:MyThirdCustomApp\n```\n",
-      "examples": [
-        "$ sf hardis:scratch:pull"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
+        },
+        "predestructivechanges": {
+          "dependsOn": [
+            "manifest"
+          ],
+          "description": "predestructivechanges",
+          "name": "predestructivechanges",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "postdestructivechanges": {
+          "dependsOn": [
+            "manifest"
+          ],
+          "description": "postdestructivechanges",
+          "name": "postdestructivechanges",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "tracksource": {
+          "char": "t",
+          "description": "tracksource",
+          "exclusive": [
+            "checkonly",
+            "validateddeployrequestid"
+          ],
+          "name": "tracksource",
           "allowNo": false,
           "type": "boolean"
         },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
+        "forceoverwrite": {
+          "char": "f",
+          "dependsOn": [
+            "tracksource"
+          ],
+          "description": "forceoverwrite",
+          "name": "forceoverwrite",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "resultsdir": {
+          "description": "resultsdir",
+          "name": "resultsdir",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "coverageformatters": {
+          "description": "coverageformatters",
+          "name": "coverageformatters",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "junit": {
+          "description": "junit",
+          "name": "junit",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "checkcoverage": {
+          "description": "Check Apex org coverage",
+          "name": "checkcoverage",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
+          "description": "debug",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
         "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
+          "description": "websocket",
           "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "target-org": {
           "aliases": [
             "targetusername",
@@ -2978,39 +2969,35 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:scratch:pull",
+      "id": "hardis:source:deploy",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Scratch PULL",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "scratch",
-        "pull.js"
+        "source",
+        "deploy.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:scratch:pull",
-        "scratch:hardis:pull",
-        "scratch:pull:hardis",
-        "hardis:pull:scratch",
-        "pull:hardis:scratch",
-        "pull:scratch:hardis"
+        "hardis:source:deploy",
+        "source:hardis:deploy",
+        "source:deploy:hardis",
+        "hardis:deploy:source",
+        "deploy:hardis:source",
+        "deploy:source:hardis"
       ]
     },
-    "hardis:scratch:push": {
+    "hardis:source:push": {
       "aliases": [],
       "args": {},
-      "description": "Push local files to scratch org\n\nCalls `sf project deploy start` under the hood\n",
-      "examples": [
-        "$ sf hardis:scratch:push"
-      ],
+      "description": "sfdx-hardis wrapper for sfdx force:source:push that displays tips to solve deployment errors.\n\n[![Assisted solving of Salesforce deployments errors](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deployment-errors.jpg)](https://nicolas.vuillamy.fr/assisted-solving-of-salesforce-deployments-errors-47f3666a9ed0)\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_push)\n",
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -3027,26 +3014,48 @@
           "multiple": false,
           "type": "option"
         },
+        "forceoverwrite": {
+          "char": "f",
+          "description": "forceoverwrite",
+          "name": "forceoverwrite",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "wait": {
+          "char": "w",
+          "description": "wait",
+          "name": "wait",
+          "default": 60,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "ignorewarnings": {
+          "char": "g",
+          "description": "ignorewarnings",
+          "name": "ignorewarnings",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "quiet": {
+          "description": "quiet",
+          "name": "quiet",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
+          "description": "debug",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
         "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
+          "description": "websocket",
           "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "target-org": {
           "aliases": [
             "targetusername",
@@ -3065,39 +3074,36 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:scratch:push",
+      "id": "hardis:source:push",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Scratch PUSH",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "scratch",
+        "source",
         "push.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:scratch:push",
-        "scratch:hardis:push",
-        "scratch:push:hardis",
-        "hardis:push:scratch",
-        "push:hardis:scratch",
-        "push:scratch:hardis"
+        "hardis:source:push",
+        "source:hardis:push",
+        "source:push:hardis",
+        "hardis:push:source",
+        "push:hardis:source",
+        "push:source:hardis"
       ]
     },
-    "hardis:source:deploy": {
+    "hardis:source:retrieve": {
       "aliases": [],
       "args": {},
-      "description": "sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.\n\nAdditional to the base command wrapper: If using **--checkonly**, add options **--checkcoverage** and **--coverageformatters json-summary** to check that org coverage is > 75% (or value defined in .sfdx-hardis.yml property **apexTestsMinCoverageOrgWide**)\n\n### Deployment results\n\nYou can also have deployment results as pull request comments, on:\n\n- GitHub (see [GitHub Pull Requests comments config](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-github/))\n- Gitlab (see [Gitlab integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-gitlab/))\n- Azure DevOps (see [Azure integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-azure/))\n\n\n[![Assisted solving of Salesforce deployments errors](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deployment-errors.jpg)](https://nicolas.vuillamy.fr/assisted-solving-of-salesforce-deployments-errors-47f3666a9ed0)\n\n### Deployment pre or post commands\n\nYou can define command lines to run before or after a deployment, with parameters:\n\n- **id**: Unique Id for the command\n- **label**: Human readable label for the command\n- **skipIfError**: If defined to \"true\", the post-command won't be run if there is a deployment failure\n- **context**: Defines the context where the command will be run. Can be **all** (default), **check-deployment-only** or **process-deployment-only**\n- **runOnlyOnceByOrg**: If set to true, the command will be run only one time per org. A record of SfdxHardisTrace__c is stored to make that possible (it needs to be existing in target org)\n\nIf the commands are not the same depending on the target org, you can define them into **config/branches/.sfdx-hardis-BRANCHNAME.yml** instead of root **config/.sfdx-hardis.yml**\n\nExample:\n\n```yaml\ncommandsPreDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to the deployment user\n    command: sf data update record --sobject User --where \"Username='deploy.github@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n\ncommandsPostDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to desired username\n    command: sf data update record --sobject User --where \"Username='admin-yser@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n  - id: someActionToRunJustOneTime\n    label: And to run only if deployment is success\n    command: sf sfdmu:run ...\n    skipIfError: true\n    context: process-deployment-only\n    runOnlyOnceByOrg: true\n```\n\nNotes:\n\n- You can disable coloring of errors in red by defining env variable SFDX_HARDIS_DEPLOY_ERR_COLORS=false\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy)\n",
-      "examples": [
-        "$ sf hardis:source:deploy -x manifest/package.xml --wait 60 --ignorewarnings --testlevel RunLocalTests --postdestructivechanges ./manifest/destructiveChanges.xml --target-org nicolas.vuillamy@cloudity.com.sfdxhardis --checkonly --checkcoverage --verbose --coverageformatters json-summary"
-      ],
+      "description": "sfdx-hardis wrapper for sfdx force:source:retrieve\n\n- If no retrieve constraint is sent, as assisted menu will request the list of metadatas to retrieve\n- If no org is selected , an assisted menu will request the user to choose one\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_retrieve)\n",
+      "examples": [],
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -3114,101 +3120,14 @@
           "multiple": false,
           "type": "option"
         },
-        "checkonly": {
-          "char": "c",
-          "description": "checkonly",
-          "name": "checkonly",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "soapdeploy": {
-          "description": "soapDeploy",
-          "name": "soapdeploy",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "wait": {
-          "char": "w",
-          "description": "wait",
-          "name": "wait",
-          "default": 60,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "testlevel": {
-          "char": "l",
-          "description": "testlevel",
-          "name": "testlevel",
-          "default": "NoTestRun",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "NoTestRun",
-            "RunSpecifiedTests",
-            "RunLocalTests",
-            "RunAllTestsInOrg"
-          ],
-          "type": "option"
-        },
-        "runtests": {
-          "char": "r",
-          "description": "runTests",
-          "name": "runtests",
-          "default": [],
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "ignoreerrors": {
-          "description": "ignoreErrors",
-          "name": "ignoreerrors",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "ignorewarnings": {
-          "char": "g",
-          "description": "ignoreWarnings",
-          "name": "ignorewarnings",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "validateddeployrequestid": {
-          "char": "q",
-          "description": "validateDeployRequestId",
-          "exclusive": [
-            "manifest",
-            "metadata",
-            "sourcepath",
-            "checkonly",
-            "testlevel",
-            "runtests",
-            "ignoreerrors",
-            "ignorewarnings"
-          ],
-          "name": "validateddeployrequestid",
+        "apiversion": {
+          "char": "a",
+          "description": "Override the api version used for api requests made by this command",
+          "name": "apiversion",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "verbose": {
-          "description": "verbose",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "metadata": {
-          "char": "m",
-          "description": "metadata",
-          "exclusive": [
-            "manifest",
-            "sourcepath"
-          ],
-          "name": "metadata",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
         "sourcepath": {
           "char": "p",
           "description": "sourcePath",
@@ -3221,9 +3140,17 @@
           "multiple": true,
           "type": "option"
         },
+        "wait": {
+          "char": "w",
+          "description": "wait",
+          "name": "wait",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "manifest": {
           "char": "x",
-          "description": "flagsLong.manifest",
+          "description": "manifest",
           "exclusive": [
             "metadata",
             "sourcepath"
@@ -3233,33 +3160,29 @@
           "multiple": false,
           "type": "option"
         },
-        "predestructivechanges": {
-          "dependsOn": [
-            "manifest"
+        "metadata": {
+          "char": "m",
+          "description": "metadata",
+          "exclusive": [
+            "manifest",
+            "sourcepath"
           ],
-          "description": "predestructivechanges",
-          "name": "predestructivechanges",
+          "name": "metadata",
           "hasDynamicHelp": false,
-          "multiple": false,
+          "multiple": true,
           "type": "option"
         },
-        "postdestructivechanges": {
-          "dependsOn": [
-            "manifest"
-          ],
-          "description": "postdestructivechanges",
-          "name": "postdestructivechanges",
+        "packagenames": {
+          "char": "n",
+          "description": "packagenames",
+          "name": "packagenames",
           "hasDynamicHelp": false,
-          "multiple": false,
+          "multiple": true,
           "type": "option"
         },
         "tracksource": {
           "char": "t",
           "description": "tracksource",
-          "exclusive": [
-            "checkonly",
-            "validateddeployrequestid"
-          ],
           "name": "tracksource",
           "allowNo": false,
           "type": "boolean"
@@ -3274,34 +3197,15 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "resultsdir": {
-          "description": "resultsdir",
-          "name": "resultsdir",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "coverageformatters": {
-          "description": "coverageformatters",
-          "name": "coverageformatters",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "junit": {
-          "description": "junit",
-          "name": "junit",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "checkcoverage": {
-          "description": "Check Apex org coverage",
-          "name": "checkcoverage",
+        "verbose": {
+          "description": "verbose",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
         },
         "debug": {
-          "description": "debug",
+          "char": "d",
+          "description": "debugMode",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
@@ -3313,6 +3217,12 @@
           "multiple": false,
           "type": "option"
         },
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "target-org": {
           "aliases": [
             "targetusername",
@@ -3331,7 +3241,7 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:deploy",
+      "id": "hardis:source:retrieve",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
@@ -3344,22 +3254,25 @@
         "commands",
         "hardis",
         "source",
-        "deploy.js"
+        "retrieve.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:deploy",
-        "source:hardis:deploy",
-        "source:deploy:hardis",
-        "hardis:deploy:source",
-        "deploy:hardis:source",
-        "deploy:source:hardis"
+        "hardis:source:retrieve",
+        "source:hardis:retrieve",
+        "source:retrieve:hardis",
+        "hardis:retrieve:source",
+        "retrieve:hardis:source",
+        "retrieve:source:hardis"
       ]
     },
-    "hardis:source:push": {
+    "hardis:work:new": {
       "aliases": [],
       "args": {},
-      "description": "sfdx-hardis wrapper for sfdx force:source:push that displays tips to solve deployment errors.\n\n[![Assisted solving of Salesforce deployments errors](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deployment-errors.jpg)](https://nicolas.vuillamy.fr/assisted-solving-of-salesforce-deployments-errors-47f3666a9ed0)\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_push)\n",
+      "description": "Assisted menu to start working on a Salesforce task.\n\nAdvanced instructions in [Create New Task documentation](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-create-new-task/)\n\nAt the end of the command, it will allow you to work on either a scratch org or a sandbox, depending on your choices.\n\nUnder the hood, it can:\n\n- Make **git pull** to be up to date with target branch\n- Create **new git branch** with formatted name (you can override the choices using .sfdx-hardis.yml property **branchPrefixChoices**)\n- Create and initialize a scratch org or a source-tracked sandbox (config can be defined using `config/.sfdx-hardis.yml`):\n- (and for scratch org only for now):\n  - **Install packages**\n      - Use property `installedPackages`\n    - **Push sources**\n    - **Assign permission sets**\n      - Use property `initPermissionSets`\n    - **Run apex initialization scripts**\n      - Use property `scratchOrgInitApexScripts`\n    - **Load data**\n      - Use property `dataPackages`\n\n## Override .sfdx-hardis.yml config\n\n### availableTargetBranches\n\nBy default, there is only one target branch (value of property **developmentBranch**).\n\nYou can define multiple target branches (for the future Pull Request) by setting the property **availableTargetBranches** in your .sfdx-hardis.yml file.\n\nThe selected branch will checked out and be used as base to create the user new feature branch.\n\nExamples:\n\n```yaml\navailableTargetBranches:\n  - integration\n  - preprod\n```\n\n```yaml\navailableTargetBranches:\n  - integration,Select this to work from the integration branch (project stream)\n  - preprod,Select this to work from the preprod branch (run stream)\n```\n\n### availableProjects\n\nYou can add a first question \"What is the project your task is for\" if you define a property **availableProjects**\n\nThe select will be used as first part of the git branch name. (ex: france/features/dev/JIRA123-webservice-get-account)\n\nExamples:\n\n```yaml\navailableProjects:\n  - build\n  - run\n  - some-big-project\n  - france\n  - uk\n```\n\n```yaml\navailableProjects:\n  - build,Select this to work on the build project\n  - run,Select this to work on the run project\n  - some-big-project,Select this to work on the some big project\n  - france,Select this to work on the France project\n  - uk,Select this to work on the UK project\n```\n\n### newTaskNameRegex\n\nIf you want to force a specific format for the task name, you can define a property **newTaskNameRegex** in your .sfdx-hardis.yml file.\n\nPlease also define a property **newTaskNameRegexExample** to give an example to the user.\n\nExample:\n\n```yaml\nnewTaskNameRegex: '^[A-Z]+-[0-9]+ .*'\nnewTaskNameRegexExample: 'MYPROJECT-123 Update account status validation rule'\n```\n\n### sharedDevSandboxes\n\nIf contributors can share dev sandboxes, let's not ask them if they want to overwrite their colleagues' changes when creating a new task :)\n",
+      "examples": [
+        "$ sf hardis:work:new"
+      ],
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -3376,48 +3289,133 @@
           "multiple": false,
           "type": "option"
         },
-        "forceoverwrite": {
-          "char": "f",
-          "description": "forceoverwrite",
-          "name": "forceoverwrite",
+        "debug": {
+          "char": "d",
+          "description": "Activate debug mode (more logs)",
+          "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
-        "wait": {
-          "char": "w",
-          "description": "wait",
-          "name": "wait",
-          "default": 60,
+        "websocket": {
+          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
+          "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "ignorewarnings": {
-          "char": "g",
-          "description": "ignorewarnings",
-          "name": "ignorewarnings",
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
           "allowNo": false,
           "type": "boolean"
         },
-        "quiet": {
-          "description": "quiet",
-          "name": "quiet",
+        "target-dev-hub": {
+          "aliases": [
+            "targetdevhubusername"
+          ],
+          "char": "v",
+          "deprecateAliases": true,
+          "name": "target-dev-hub",
+          "noCacheDefault": true,
+          "required": false,
+          "summary": "Username or alias of the Dev Hub org.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        },
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
+          "char": "o",
+          "deprecateAliases": true,
+          "name": "target-org",
+          "noCacheDefault": true,
+          "summary": "Username or alias of the target org.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": true,
+      "hiddenAliases": [],
+      "id": "hardis:work:new",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "New work task",
+      "requiresProject": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "work",
+        "new.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:work:new",
+        "work:hardis:new",
+        "work:new:hardis",
+        "hardis:new:work",
+        "new:hardis:work",
+        "new:work:hardis"
+      ]
+    },
+    "hardis:work:refresh": {
+      "aliases": [],
+      "args": {},
+      "description": "Make my local branch and my scratch org up to date with the most recent sources",
+      "examples": [
+        "$ sf hardis:work:refresh"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "nopull": {
+          "char": "n",
+          "description": "No scratch pull before save (careful if you use that!)",
+          "name": "nopull",
           "allowNo": false,
           "type": "boolean"
         },
         "debug": {
-          "description": "debug",
+          "char": "d",
+          "description": "Activate debug mode (more logs)",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
         "websocket": {
-          "description": "websocket",
+          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
           "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "target-org": {
           "aliases": [
             "targetusername",
@@ -3436,36 +3434,127 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:push",
+      "id": "hardis:work:refresh",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
+      "title": "Refresh work task",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "source",
-        "push.js"
+        "work",
+        "refresh.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:push",
-        "source:hardis:push",
-        "source:push:hardis",
-        "hardis:push:source",
-        "push:hardis:source",
-        "push:source:hardis"
+        "hardis:work:refresh",
+        "work:hardis:refresh",
+        "work:refresh:hardis",
+        "hardis:refresh:work",
+        "refresh:hardis:work",
+        "refresh:work:hardis"
+      ]
+    },
+    "hardis:work:resetselection": {
+      "aliases": [],
+      "args": {},
+      "description": "Resets the selection that we want to add in the merge request\n\nCalls a soft git reset behind the hood  \n",
+      "examples": [
+        "$ sf hardis:work:resetsave"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "debug": {
+          "char": "d",
+          "description": "Activate debug mode (more logs)",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "websocket": {
+          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
+          "name": "websocket",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
+          "char": "o",
+          "deprecateAliases": true,
+          "name": "target-org",
+          "noCacheDefault": true,
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": true,
+      "hiddenAliases": [],
+      "id": "hardis:work:resetselection",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Select again",
+      "requiresProject": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "work",
+        "resetselection.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:work:resetselection",
+        "work:hardis:resetselection",
+        "work:resetselection:hardis",
+        "hardis:resetselection:work",
+        "resetselection:hardis:work",
+        "resetselection:work:hardis"
       ]
     },
-    "hardis:source:retrieve": {
+    "hardis:work:save": {
       "aliases": [],
       "args": {},
-      "description": "sfdx-hardis wrapper for sfdx force:source:retrieve\n\n- If no retrieve constraint is sent, as assisted menu will request the list of metadatas to retrieve\n- If no org is selected , an assisted menu will request the user to choose one\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_retrieve)\n",
-      "examples": [],
+      "description": "When a work task is completed, guide user to create a merge request\n\nAdvanced instructions in [Publish a task](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-publish-task/)\n\n- Generate package-xml diff using sfdx-git-delta\n- Automatically update `manifest/package.xml` and `manifest/destructiveChanges.xml` according to the committed updates\n- Automatically Clean XML files using `.sfdx-hardis.yml` properties\n  - `autocleantypes`: List of auto-performed sources cleanings, available on command [hardis:project:clean:references](https://sfdx-hardis.cloudity.com/hardis/project/clean/references/)\n  - `autoRemoveUserPermissions`: List of userPermission to automatically remove from profile metadatas\n\nExample:\n\n```yaml\nautoCleanTypes:\n  - checkPermissions\n  - destructivechanges\n  - datadotcom\n  - minimizeProfiles\n  - listViewsMine\nautoRemoveUserPermissions:\n  - EnableCommunityAppLauncher\n  - FieldServiceAccess\n  - OmnichannelInventorySync\n  - SendExternalEmailAvailable\n  - UseOmnichannelInventoryAPIs\n  - ViewDataLeakageEvents\n  - ViewMLModels\n  - ViewPlatformEvents\n  - WorkCalibrationUser\n```\n\n- Push commit to server\n  ",
+      "examples": [
+        "$ sf hardis:work:task:save",
+        "$ sf hardis:work:task:save --nopull --nogit --noclean"
+      ],
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -3482,98 +3571,49 @@
           "multiple": false,
           "type": "option"
         },
-        "apiversion": {
-          "char": "a",
-          "description": "Override the api version used for api requests made by this command",
-          "name": "apiversion",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sourcepath": {
-          "char": "p",
-          "description": "sourcePath",
-          "exclusive": [
-            "manifest",
-            "metadata"
-          ],
-          "name": "sourcepath",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "wait": {
-          "char": "w",
-          "description": "wait",
-          "name": "wait",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "manifest": {
-          "char": "x",
-          "description": "manifest",
-          "exclusive": [
-            "metadata",
-            "sourcepath"
-          ],
-          "name": "manifest",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "metadata": {
-          "char": "m",
-          "description": "metadata",
-          "exclusive": [
-            "manifest",
-            "sourcepath"
-          ],
-          "name": "metadata",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "packagenames": {
+        "nopull": {
           "char": "n",
-          "description": "packagenames",
-          "name": "packagenames",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
+          "description": "No scratch pull before save",
+          "name": "nopull",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "tracksource": {
-          "char": "t",
-          "description": "tracksource",
-          "name": "tracksource",
+        "nogit": {
+          "char": "g",
+          "description": "No automated git operations",
+          "name": "nogit",
           "allowNo": false,
           "type": "boolean"
         },
-        "forceoverwrite": {
-          "char": "f",
-          "dependsOn": [
-            "tracksource"
-          ],
-          "description": "forceoverwrite",
-          "name": "forceoverwrite",
+        "noclean": {
+          "char": "c",
+          "description": "No cleaning of local sources",
+          "name": "noclean",
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "description": "verbose",
-          "name": "verbose",
+        "auto": {
+          "description": "No user prompts (when called from CI for example)",
+          "name": "auto",
           "allowNo": false,
           "type": "boolean"
         },
+        "targetbranch": {
+          "description": "Name of the Merge Request target branch. Will be guessed or prompted if not provided.",
+          "name": "targetbranch",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "debug": {
           "char": "d",
-          "description": "debugMode",
+          "description": "Activate debug mode (more logs)",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
         "websocket": {
-          "description": "websocket",
+          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
           "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -3603,37 +3643,41 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:retrieve",
+      "id": "hardis:work:save",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
+      "title": "Save work task",
       "requiresProject": true,
+      "requiresSfdxPlugins": [
+        "sfdx-git-delta"
+      ],
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "source",
-        "retrieve.js"
+        "work",
+        "save.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:retrieve",
-        "source:hardis:retrieve",
-        "source:retrieve:hardis",
-        "hardis:retrieve:source",
-        "retrieve:hardis:source",
-        "retrieve:source:hardis"
+        "hardis:work:save",
+        "work:hardis:save",
+        "work:save:hardis",
+        "hardis:save:work",
+        "save:hardis:work",
+        "save:work:hardis"
       ]
     },
-    "hardis:work:new": {
+    "hardis:work:ws": {
       "aliases": [],
       "args": {},
-      "description": "Assisted menu to start working on a Salesforce task.\n\nAdvanced instructions in [Create New Task documentation](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-create-new-task/)\n\nAt the end of the command, it will allow you to work on either a scratch org or a sandbox, depending on your choices.\n\nUnder the hood, it can:\n\n- Make **git pull** to be up to date with target branch\n- Create **new git branch** with formatted name (you can override the choices using .sfdx-hardis.yml property **branchPrefixChoices**)\n- Create and initialize a scratch org or a source-tracked sandbox (config can be defined using `config/.sfdx-hardis.yml`):\n- (and for scratch org only for now):\n  - **Install packages**\n      - Use property `installedPackages`\n    - **Push sources**\n    - **Assign permission sets**\n      - Use property `initPermissionSets`\n    - **Run apex initialization scripts**\n      - Use property `scratchOrgInitApexScripts`\n    - **Load data**\n      - Use property `dataPackages`\n\n## Override .sfdx-hardis.yml config\n\n### availableTargetBranches\n\nBy default, there is only one target branch (value of property **developmentBranch**).\n\nYou can define multiple target branches (for the future Pull Request) by setting the property **availableTargetBranches** in your .sfdx-hardis.yml file.\n\nThe selected branch will checked out and be used as base to create the user new feature branch.\n\nExamples:\n\n```yaml\navailableTargetBranches:\n  - integration\n  - preprod\n```\n\n```yaml\navailableTargetBranches:\n  - integration,Select this to work from the integration branch (project stream)\n  - preprod,Select this to work from the preprod branch (run stream)\n```\n\n### availableProjects\n\nYou can add a first question \"What is the project your task is for\" if you define a property **availableProjects**\n\nThe select will be used as first part of the git branch name. (ex: france/features/dev/JIRA123-webservice-get-account)\n\nExamples:\n\n```yaml\navailableProjects:\n  - build\n  - run\n  - some-big-project\n  - france\n  - uk\n```\n\n```yaml\navailableProjects:\n  - build,Select this to work on the build project\n  - run,Select this to work on the run project\n  - some-big-project,Select this to work on the some big project\n  - france,Select this to work on the France project\n  - uk,Select this to work on the UK project\n```\n\n### newTaskNameRegex\n\nIf you want to force a specific format for the task name, you can define a property **newTaskNameRegex** in your .sfdx-hardis.yml file.\n\nPlease also define a property **newTaskNameRegexExample** to give an example to the user.\n\nExample:\n\n```yaml\nnewTaskNameRegex: '^[A-Z]+-[0-9]+ .*'\nnewTaskNameRegexExample: 'MYPROJECT-123 Update account status validation rule'\n```\n\n### sharedDevSandboxes\n\nIf contributors can share dev sandboxes, let's not ask them if they want to overwrite their colleagues' changes when creating a new task :)\n",
+      "description": "Technical calls to WebSocket functions",
       "examples": [
-        "$ sf hardis:work:new"
+        "$ sf hardis:work:ws --event refreshStatus"
       ],
       "flags": {
         "json": {
@@ -3651,6 +3695,14 @@
           "multiple": false,
           "type": "option"
         },
+        "event": {
+          "char": "e",
+          "description": "WebSocket event",
+          "name": "event",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -3670,70 +3722,42 @@
           "name": "skipauth",
           "allowNo": false,
           "type": "boolean"
-        },
-        "target-dev-hub": {
-          "aliases": [
-            "targetdevhubusername"
-          ],
-          "char": "v",
-          "deprecateAliases": true,
-          "name": "target-dev-hub",
-          "noCacheDefault": true,
-          "required": false,
-          "summary": "Username or alias of the Dev Hub org.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        },
-        "target-org": {
-          "aliases": [
-            "targetusername",
-            "u"
-          ],
-          "char": "o",
-          "deprecateAliases": true,
-          "name": "target-org",
-          "noCacheDefault": true,
-          "summary": "Username or alias of the target org.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
         }
       },
-      "hasDynamicHelp": true,
+      "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:work:new",
+      "id": "hardis:work:ws",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "New work task",
-      "requiresProject": true,
+      "title": "WebSocket operations",
+      "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
         "work",
-        "new.js"
+        "ws.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:work:new",
-        "work:hardis:new",
-        "work:new:hardis",
-        "hardis:new:work",
-        "new:hardis:work",
-        "new:work:hardis"
+        "hardis:work:ws",
+        "work:hardis:ws",
+        "work:ws:hardis",
+        "hardis:ws:work",
+        "ws:hardis:work",
+        "ws:work:hardis"
       ]
     },
-    "hardis:work:refresh": {
+    "hardis:scratch:create": {
       "aliases": [],
       "args": {},
-      "description": "Make my local branch and my scratch org up to date with the most recent sources",
+      "description": "Create and initialize a scratch org or a source-tracked sandbox (config can be defined using `config/.sfdx-hardis.yml`):\n\n- **Install packages**\n  - Use property `installedPackages`\n- **Push sources**\n- **Assign permission sets**\n  - Use property `initPermissionSets`\n- **Run apex initialization scripts**\n  - Use property `scratchOrgInitApexScripts`\n- **Load data**\n  - Use property `dataPackages`\n  ",
       "examples": [
-        "$ sf hardis:work:refresh"
+        "$ sf hardis:scratch:create"
       ],
       "flags": {
         "json": {
@@ -3751,10 +3775,16 @@
           "multiple": false,
           "type": "option"
         },
-        "nopull": {
+        "forcenew": {
           "char": "n",
-          "description": "No scratch pull before save (careful if you use that!)",
-          "name": "nopull",
+          "description": "If an existing scratch org exists, do not reuse it but create a new one",
+          "name": "forcenew",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "pool": {
+          "description": "Creates the scratch org for a scratch org pool",
+          "name": "pool",
           "allowNo": false,
           "type": "boolean"
         },
@@ -3778,17 +3808,16 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "target-org": {
+        "target-dev-hub": {
           "aliases": [
-            "targetusername",
-            "u"
+            "targetdevhubusername"
           ],
-          "char": "o",
+          "char": "v",
           "deprecateAliases": true,
-          "name": "target-org",
+          "name": "target-dev-hub",
           "noCacheDefault": true,
           "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "summary": "Username or alias of the Dev Hub org. Not required if the `target-dev-hub` configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
@@ -3796,38 +3825,42 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:work:refresh",
+      "id": "hardis:scratch:create",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Refresh work task",
+      "title": "Create and initialize scratch org",
       "requiresProject": true,
+      "requiresSfdxPlugins": [
+        "sfdmu",
+        "texei-sfdx-plugin"
+      ],
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "work",
-        "refresh.js"
+        "scratch",
+        "create.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:work:refresh",
-        "work:hardis:refresh",
-        "work:refresh:hardis",
-        "hardis:refresh:work",
-        "refresh:hardis:work",
-        "refresh:work:hardis"
+        "hardis:scratch:create",
+        "scratch:hardis:create",
+        "scratch:create:hardis",
+        "hardis:create:scratch",
+        "create:hardis:scratch",
+        "create:scratch:hardis"
       ]
     },
-    "hardis:work:resetselection": {
+    "hardis:scratch:delete": {
       "aliases": [],
       "args": {},
-      "description": "Resets the selection that we want to add in the merge request\n\nCalls a soft git reset behind the hood  \n",
+      "description": "Assisted menu to delete scratch orgs associated to a DevHub",
       "examples": [
-        "$ sf hardis:work:resetsave"
+        "$ sf hardis:scratch:delete"
       ],
       "flags": {
         "json": {
@@ -3865,17 +3898,16 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "target-org": {
+        "target-dev-hub": {
           "aliases": [
-            "targetusername",
-            "u"
+            "targetdevhubusername"
           ],
-          "char": "o",
+          "char": "v",
           "deprecateAliases": true,
-          "name": "target-org",
+          "name": "target-dev-hub",
           "noCacheDefault": true,
           "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "summary": "Username or alias of the Dev Hub org. Not required if the `target-dev-hub` configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
@@ -3883,39 +3915,37 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:work:resetselection",
+      "id": "hardis:scratch:delete",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Select again",
-      "requiresProject": true,
+      "title": "Delete scratch orgs(s)",
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "work",
-        "resetselection.js"
+        "scratch",
+        "delete.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:work:resetselection",
-        "work:hardis:resetselection",
-        "work:resetselection:hardis",
-        "hardis:resetselection:work",
-        "resetselection:hardis:work",
-        "resetselection:work:hardis"
+        "hardis:scratch:delete",
+        "scratch:hardis:delete",
+        "scratch:delete:hardis",
+        "hardis:delete:scratch",
+        "delete:hardis:scratch",
+        "delete:scratch:hardis"
       ]
     },
-    "hardis:work:save": {
+    "hardis:scratch:pull": {
       "aliases": [],
       "args": {},
-      "description": "When a work task is completed, guide user to create a merge request\n\nAdvanced instructions in [Publish a task](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-publish-task/)\n\n- Generate package-xml diff using sfdx-git-delta\n- Automatically update `manifest/package.xml` and `manifest/destructiveChanges.xml` according to the committed updates\n- Automatically Clean XML files using `.sfdx-hardis.yml` properties\n  - `autocleantypes`: List of auto-performed sources cleanings, available on command [hardis:project:clean:references](https://sfdx-hardis.cloudity.com/hardis/project/clean/references/)\n  - `autoRemoveUserPermissions`: List of userPermission to automatically remove from profile metadatas\n\nExample:\n\n```yaml\nautoCleanTypes:\n  - checkPermissions\n  - destructivechanges\n  - datadotcom\n  - minimizeProfiles\n  - listViewsMine\nautoRemoveUserPermissions:\n  - EnableCommunityAppLauncher\n  - FieldServiceAccess\n  - OmnichannelInventorySync\n  - SendExternalEmailAvailable\n  - UseOmnichannelInventoryAPIs\n  - ViewDataLeakageEvents\n  - ViewMLModels\n  - ViewPlatformEvents\n  - WorkCalibrationUser\n```\n\n- Push commit to server\n  ",
+      "description": "This commands pulls the updates you performed in your scratch or sandbox org, into your local files\n\nThen, you probably want to stage and commit the files containing the updates you want to keep, as explained in this video.\n\n<iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/Ik6whtflmfY\" title=\"YouTube video player\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>\n\n- Calls `sf project retrieve start` under the hood\n- If there are errors, proposes to automatically add erroneous item in `.forceignore`, then pull again\n- If you don't see your updated items in the results, you can manually retrieve [using SF Extension **Org Browser** or **Salesforce CLI**](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-publish-task/#retrieve-metadatas)\n- If you want to always retrieve sources like CustomApplication that are not always detected as updates by project:retrieve:start , you can define property **autoRetrieveWhenPull** in .sfdx-hardis.yml\n\nExample:\n```yaml\nautoRetrieveWhenPull:\n  - CustomApplication:MyCustomApplication\n  - CustomApplication:MyOtherCustomApplication\n  - CustomApplication:MyThirdCustomApp\n```\n",
       "examples": [
-        "$ sf hardis:work:task:save",
-        "$ sf hardis:work:task:save --nopull --nogit --noclean"
+        "$ sf hardis:scratch:pull"
       ],
       "flags": {
         "json": {
@@ -3933,40 +3963,6 @@
           "multiple": false,
           "type": "option"
         },
-        "nopull": {
-          "char": "n",
-          "description": "No scratch pull before save",
-          "name": "nopull",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "nogit": {
-          "char": "g",
-          "description": "No automated git operations",
-          "name": "nogit",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "noclean": {
-          "char": "c",
-          "description": "No cleaning of local sources",
-          "name": "noclean",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "auto": {
-          "description": "No user prompts (when called from CI for example)",
-          "name": "auto",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "targetbranch": {
-          "description": "Name of the Merge Request target branch. Will be guessed or prompted if not provided.",
-          "name": "targetbranch",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -4005,41 +4001,38 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:work:save",
+      "id": "hardis:scratch:pull",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Save work task",
+      "title": "Scratch PULL",
       "requiresProject": true,
-      "requiresSfdxPlugins": [
-        "sfdx-git-delta"
-      ],
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "work",
-        "save.js"
+        "scratch",
+        "pull.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:work:save",
-        "work:hardis:save",
-        "work:save:hardis",
-        "hardis:save:work",
-        "save:hardis:work",
-        "save:work:hardis"
+        "hardis:scratch:pull",
+        "scratch:hardis:pull",
+        "scratch:pull:hardis",
+        "hardis:pull:scratch",
+        "pull:hardis:scratch",
+        "pull:scratch:hardis"
       ]
     },
-    "hardis:work:ws": {
+    "hardis:scratch:push": {
       "aliases": [],
       "args": {},
-      "description": "Technical calls to WebSocket functions",
+      "description": "Push local files to scratch org\n\nCalls `sf project deploy start` under the hood\n",
       "examples": [
-        "$ sf hardis:work:ws --event refreshStatus"
+        "$ sf hardis:scratch:push"
       ],
       "flags": {
         "json": {
@@ -4057,14 +4050,6 @@
           "multiple": false,
           "type": "option"
         },
-        "event": {
-          "char": "e",
-          "description": "WebSocket event",
-          "name": "event",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -4084,34 +4069,49 @@
           "name": "skipauth",
           "allowNo": false,
           "type": "boolean"
+        },
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
+          "char": "o",
+          "deprecateAliases": true,
+          "name": "target-org",
+          "noCacheDefault": true,
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
         }
       },
-      "hasDynamicHelp": false,
+      "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:work:ws",
+      "id": "hardis:scratch:push",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "WebSocket operations",
-      "requiresProject": false,
+      "title": "Scratch PUSH",
+      "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "work",
-        "ws.js"
+        "scratch",
+        "push.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:work:ws",
-        "work:hardis:ws",
-        "work:ws:hardis",
-        "hardis:ws:work",
-        "ws:hardis:work",
-        "ws:work:hardis"
+        "hardis:scratch:push",
+        "scratch:hardis:push",
+        "scratch:push:hardis",
+        "hardis:push:scratch",
+        "push:hardis:scratch",
+        "push:scratch:hardis"
       ]
     },
     "hardis:doc:extract:permsetgroups": {
@@ -4202,115 +4202,23 @@
         "hardis:doc:permsetgroups:extract",
         "doc:hardis:permsetgroups:extract",
         "doc:permsetgroups:hardis:extract",
-        "doc:permsetgroups:extract:hardis",
-        "hardis:permsetgroups:doc:extract",
-        "permsetgroups:hardis:doc:extract",
-        "permsetgroups:doc:hardis:extract",
-        "permsetgroups:doc:extract:hardis",
-        "hardis:permsetgroups:extract:doc",
-        "permsetgroups:hardis:extract:doc",
-        "permsetgroups:extract:hardis:doc",
-        "permsetgroups:extract:doc:hardis"
-      ]
-    },
-    "hardis:doc:plugin:generate": {
-      "aliases": [],
-      "args": {},
-      "description": "Generate Markdown documentation ready for HTML conversion with mkdocs\n\nAfter the first run, you need to update manually:\n\n- mkdocs.yml\n- .github/workflows/build-deploy-docs.yml\n- docs/javascripts/gtag.js , if you want Google Analytics tracking\n\nThen, activate Github pages, with \"gh_pages\" as target branch\n\nAt each merge into master/main branch, the GitHub Action build-deploy-docs will rebuild documentation and publish it in GitHub pages\n",
-      "examples": [
-        "$ sf hardis:doc:plugin:generate"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
-          "name": "websocket",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "hardis:doc:plugin:generate",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Generate SF Cli Plugin Documentation",
-      "requiresProject": false,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "doc",
-        "plugin",
-        "generate.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:doc:plugin:generate",
-        "doc:hardis:plugin:generate",
-        "doc:plugin:hardis:generate",
-        "doc:plugin:generate:hardis",
-        "hardis:plugin:doc:generate",
-        "plugin:hardis:doc:generate",
-        "plugin:doc:hardis:generate",
-        "plugin:doc:generate:hardis",
-        "hardis:plugin:generate:doc",
-        "plugin:hardis:generate:doc",
-        "plugin:generate:hardis:doc",
-        "plugin:generate:doc:hardis",
-        "hardis:doc:generate:plugin",
-        "doc:hardis:generate:plugin",
-        "doc:generate:hardis:plugin",
-        "doc:generate:plugin:hardis",
-        "hardis:generate:doc:plugin",
-        "generate:hardis:doc:plugin",
-        "generate:doc:hardis:plugin",
-        "generate:doc:plugin:hardis",
-        "hardis:generate:plugin:doc",
-        "generate:hardis:plugin:doc",
-        "generate:plugin:hardis:doc",
-        "generate:plugin:doc:hardis"
+        "doc:permsetgroups:extract:hardis",
+        "hardis:permsetgroups:doc:extract",
+        "permsetgroups:hardis:doc:extract",
+        "permsetgroups:doc:hardis:extract",
+        "permsetgroups:doc:extract:hardis",
+        "hardis:permsetgroups:extract:doc",
+        "permsetgroups:hardis:extract:doc",
+        "permsetgroups:extract:hardis:doc",
+        "permsetgroups:extract:doc:hardis"
       ]
     },
-    "hardis:git:pull-requests:extract": {
+    "hardis:doc:plugin:generate": {
       "aliases": [],
       "args": {},
-      "description": "Extract pull requests with filtering criteria",
+      "description": "Generate Markdown documentation ready for HTML conversion with mkdocs\n\nAfter the first run, you need to update manually:\n\n- mkdocs.yml\n- .github/workflows/build-deploy-docs.yml\n- docs/javascripts/gtag.js , if you want Google Analytics tracking\n\nThen, activate Github pages, with \"gh_pages\" as target branch\n\nAt each merge into master/main branch, the GitHub Action build-deploy-docs will rebuild documentation and publish it in GitHub pages\n",
       "examples": [
-        "$ sf hardis:git:pull-requests:extract",
-        "$ sf hardis:git:pull-requests:extract --target-branch main --status merged"
+        "$ sf hardis:doc:plugin:generate"
       ],
       "flags": {
         "json": {
@@ -4328,43 +4236,6 @@
           "multiple": false,
           "type": "option"
         },
-        "target-branch": {
-          "char": "t",
-          "description": "Target branch of PRs",
-          "name": "target-branch",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "status": {
-          "char": "x",
-          "description": "Status of the PR",
-          "name": "status",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "open",
-            "merged",
-            "abandoned"
-          ],
-          "type": "option"
-        },
-        "min-date": {
-          "char": "m",
-          "description": "Minimum date for PR",
-          "name": "min-date",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "outputfile": {
-          "char": "f",
-          "description": "Force the path and name of output report file. Must end with .csv",
-          "name": "outputfile",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -4388,49 +4259,49 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:git:pull-requests:extract",
+      "id": "hardis:doc:plugin:generate",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Extract pull requests",
-      "requiresProject": true,
+      "title": "Generate SF Cli Plugin Documentation",
+      "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "git",
-        "pull-requests",
-        "extract.js"
+        "doc",
+        "plugin",
+        "generate.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:git:pull-requests:extract",
-        "git:hardis:pull-requests:extract",
-        "git:pull-requests:hardis:extract",
-        "git:pull-requests:extract:hardis",
-        "hardis:pull-requests:git:extract",
-        "pull-requests:hardis:git:extract",
-        "pull-requests:git:hardis:extract",
-        "pull-requests:git:extract:hardis",
-        "hardis:pull-requests:extract:git",
-        "pull-requests:hardis:extract:git",
-        "pull-requests:extract:hardis:git",
-        "pull-requests:extract:git:hardis",
-        "hardis:git:extract:pull-requests",
-        "git:hardis:extract:pull-requests",
-        "git:extract:hardis:pull-requests",
-        "git:extract:pull-requests:hardis",
-        "hardis:extract:git:pull-requests",
-        "extract:hardis:git:pull-requests",
-        "extract:git:hardis:pull-requests",
-        "extract:git:pull-requests:hardis",
-        "hardis:extract:pull-requests:git",
-        "extract:hardis:pull-requests:git",
-        "extract:pull-requests:hardis:git",
-        "extract:pull-requests:git:hardis"
+        "hardis:doc:plugin:generate",
+        "doc:hardis:plugin:generate",
+        "doc:plugin:hardis:generate",
+        "doc:plugin:generate:hardis",
+        "hardis:plugin:doc:generate",
+        "plugin:hardis:doc:generate",
+        "plugin:doc:hardis:generate",
+        "plugin:doc:generate:hardis",
+        "hardis:plugin:generate:doc",
+        "plugin:hardis:generate:doc",
+        "plugin:generate:hardis:doc",
+        "plugin:generate:doc:hardis",
+        "hardis:doc:generate:plugin",
+        "doc:hardis:generate:plugin",
+        "doc:generate:hardis:plugin",
+        "doc:generate:plugin:hardis",
+        "hardis:generate:doc:plugin",
+        "generate:hardis:doc:plugin",
+        "generate:doc:hardis:plugin",
+        "generate:doc:plugin:hardis",
+        "hardis:generate:plugin:doc",
+        "generate:hardis:plugin:doc",
+        "generate:plugin:hardis:doc",
+        "generate:plugin:doc:hardis"
       ]
     },
     "hardis:org:community:update": {
@@ -4744,17 +4615,164 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "orginstanceurl": {
+          "description": "Org instance url (technical param, do not use manually)",
+          "name": "orginstanceurl",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "debug": {
+          "char": "d",
+          "description": "Activate debug mode (more logs)",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "websocket": {
+          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
+          "name": "websocket",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
+          "char": "o",
+          "deprecateAliases": true,
+          "name": "target-org",
+          "noCacheDefault": true,
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": true,
+      "hiddenAliases": [],
+      "id": "hardis:org:configure:monitoring",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Configure org monitoring",
+      "requiresProject": false,
+      "requiresDependencies": [
+        "openssl"
+      ],
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "org",
+        "configure",
+        "monitoring.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:org:configure:monitoring",
+        "org:hardis:configure:monitoring",
+        "org:configure:hardis:monitoring",
+        "org:configure:monitoring:hardis",
+        "hardis:configure:org:monitoring",
+        "configure:hardis:org:monitoring",
+        "configure:org:hardis:monitoring",
+        "configure:org:monitoring:hardis",
+        "hardis:configure:monitoring:org",
+        "configure:hardis:monitoring:org",
+        "configure:monitoring:hardis:org",
+        "configure:monitoring:org:hardis",
+        "hardis:org:monitoring:configure",
+        "org:hardis:monitoring:configure",
+        "org:monitoring:hardis:configure",
+        "org:monitoring:configure:hardis",
+        "hardis:monitoring:org:configure",
+        "monitoring:hardis:org:configure",
+        "monitoring:org:hardis:configure",
+        "monitoring:org:configure:hardis",
+        "hardis:monitoring:configure:org",
+        "monitoring:hardis:configure:org",
+        "monitoring:configure:hardis:org",
+        "monitoring:configure:org:hardis"
+      ]
+    },
+    "hardis:git:pull-requests:extract": {
+      "aliases": [],
+      "args": {},
+      "description": "Extract pull requests with filtering criteria",
+      "examples": [
+        "$ sf hardis:git:pull-requests:extract",
+        "$ sf hardis:git:pull-requests:extract --target-branch main --status merged"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "target-branch": {
+          "char": "t",
+          "description": "Target branch of PRs",
+          "name": "target-branch",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "status": {
+          "char": "x",
+          "description": "Status of the PR",
+          "name": "status",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "open",
+            "merged",
+            "abandoned"
+          ],
+          "type": "option"
+        },
+        "min-date": {
+          "char": "m",
+          "description": "Minimum date for PR",
+          "name": "min-date",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "orginstanceurl": {
-          "description": "Org instance url (technical param, do not use manually)",
-          "name": "orginstanceurl",
+        "outputfile": {
+          "char": "f",
+          "description": "Force the path and name of output report file. Must end with .csv",
+          "name": "outputfile",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -4778,71 +4796,53 @@
           "name": "skipauth",
           "allowNo": false,
           "type": "boolean"
-        },
-        "target-org": {
-          "aliases": [
-            "targetusername",
-            "u"
-          ],
-          "char": "o",
-          "deprecateAliases": true,
-          "name": "target-org",
-          "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
         }
       },
-      "hasDynamicHelp": true,
+      "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:org:configure:monitoring",
+      "id": "hardis:git:pull-requests:extract",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Configure org monitoring",
-      "requiresProject": false,
-      "requiresDependencies": [
-        "openssl"
-      ],
+      "title": "Extract pull requests",
+      "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "org",
-        "configure",
-        "monitoring.js"
+        "git",
+        "pull-requests",
+        "extract.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:configure:monitoring",
-        "org:hardis:configure:monitoring",
-        "org:configure:hardis:monitoring",
-        "org:configure:monitoring:hardis",
-        "hardis:configure:org:monitoring",
-        "configure:hardis:org:monitoring",
-        "configure:org:hardis:monitoring",
-        "configure:org:monitoring:hardis",
-        "hardis:configure:monitoring:org",
-        "configure:hardis:monitoring:org",
-        "configure:monitoring:hardis:org",
-        "configure:monitoring:org:hardis",
-        "hardis:org:monitoring:configure",
-        "org:hardis:monitoring:configure",
-        "org:monitoring:hardis:configure",
-        "org:monitoring:configure:hardis",
-        "hardis:monitoring:org:configure",
-        "monitoring:hardis:org:configure",
-        "monitoring:org:hardis:configure",
-        "monitoring:org:configure:hardis",
-        "hardis:monitoring:configure:org",
-        "monitoring:hardis:configure:org",
-        "monitoring:configure:hardis:org",
-        "monitoring:configure:org:hardis"
+        "hardis:git:pull-requests:extract",
+        "git:hardis:pull-requests:extract",
+        "git:pull-requests:hardis:extract",
+        "git:pull-requests:extract:hardis",
+        "hardis:pull-requests:git:extract",
+        "pull-requests:hardis:git:extract",
+        "pull-requests:git:hardis:extract",
+        "pull-requests:git:extract:hardis",
+        "hardis:pull-requests:extract:git",
+        "pull-requests:hardis:extract:git",
+        "pull-requests:extract:hardis:git",
+        "pull-requests:extract:git:hardis",
+        "hardis:git:extract:pull-requests",
+        "git:hardis:extract:pull-requests",
+        "git:extract:hardis:pull-requests",
+        "git:extract:pull-requests:hardis",
+        "hardis:extract:git:pull-requests",
+        "extract:hardis:git:pull-requests",
+        "extract:git:hardis:pull-requests",
+        "extract:git:pull-requests:hardis",
+        "hardis:extract:pull-requests:git",
+        "extract:hardis:pull-requests:git",
+        "extract:pull-requests:hardis:git",
+        "extract:pull-requests:git:hardis"
       ]
     },
     "hardis:org:data:delete": {
@@ -7039,7 +7039,7 @@
     "hardis:org:monitor:backup": {
       "aliases": [],
       "args": {},
-      "description": "Retrieve sfdx sources in the context of a monitoring backup\n\nThe command exists in 2 modes: filtered(default & recommended) and full.\n\n## Filtered mode (default, better performances)\n\nAutomatically skips metadatas from installed packages with namespace.  \n\nYou can remove more metadata types from backup, especially in case you have too many metadatas and that provokes a crash, using:\n\n- Manual update of `manifest/package-skip-items.xml` config file (then commit & push in the same branch)\n\n- Environment variable MONITORING_BACKUP_SKIP_METADATA_TYPES (example: `MONITORING_BACKUP_SKIP_METADATA_TYPES=CustomLabel,StaticResource,Translation`): that will be applied to all monitoring branches.\n\n## Full mode\n\nActivate it with **--full** parameter, or variable MONITORING_BACKUP_MODE_FULL=true\n\nIgnores filters (namespaces items & manifest/package-skip-items.xml) to retrieve ALL metadatas, including those you might not care about (reports, translations...)\n\nAs we can retrieve only 10000 files by call, the list of all metadatas will be chunked to make multiple calls (and take more time than filtered mode)\n\n- if you use `--full-apply-filters` , manifest/package-skip-items.xml and MONITORING_BACKUP_SKIP_METADATA_TYPES filters will be applied anyway\n- if you use `--exclude-namespaces` , namespaced items will be ignored\n\n_With those both options, it's like if you are not using --full, but with chunked metadata download_\n\n## In CI/CD\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-metadata-backup/) and can output Grafana, Slack and MsTeams Notifications.\n\n## Documentation\n\n[Doc generation (including visual flows)](https://sfdx-hardis.cloudity.com/hardis/doc/project2markdown/) is triggered at the end of the command.\n\nIf you want to also upload HTML Documentation on your Salesforce Org as static resource, use variable **SFDX_HARDIS_DOC_DEPLOY_TO_ORG=\"true\"**\n\nIf you want to also upload HTML Documentation on Cloudflare, use variable **SFDX_HARDIS_DOC_DEPLOY_TO_CLOUDFLARE=\"true\"**\n\nIf Flow history doc always display a single state, you probably need to update your workflow configuration:\n\n- on Gitlab: Env variable [`GIT_FETCH_EXTRA_FLAGS: --depth 10000`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/.gitlab-ci.yml#L11)\n- on GitHub: [`fetch-depth: 0`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/.github/workflows/org-monitoring.yml#L58)\n- on Azure: [`fetchDepth: \"0\"`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/azure-pipelines.yml#L39)\n- on Bitbucket: [`step: clone: depth: full`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/bitbucket-pipelines.yml#L18)\n",
+      "description": "Retrieve sfdx sources in the context of a monitoring backup\n\nThe command exists in 2 modes: filtered(default & recommended) and full.\n\n## Filtered mode (default, better performances)\n\nAutomatically skips metadatas from installed packages with namespace.  \n\nYou can remove more metadata types from backup, especially in case you have too many metadatas and that provokes a crash, using:\n\n- Manual update of `manifest/package-skip-items.xml` config file (then commit & push in the same branch)\n\n  - Works with full wildcard (`<members>*</members>`) , named metadata (`<members>Account.Name</members>`) or partial wildcards names (`<members>pi__*</members>` , `<members>*__dlm</members>` , or `<members>prefix*suffix</members>`)\n\n- Environment variable MONITORING_BACKUP_SKIP_METADATA_TYPES (example: `MONITORING_BACKUP_SKIP_METADATA_TYPES=CustomLabel,StaticResource,Translation`): that will be applied to all monitoring branches.\n\n## Full mode\n\nActivate it with **--full** parameter, or variable MONITORING_BACKUP_MODE_FULL=true\n\nIgnores filters (namespaces items & manifest/package-skip-items.xml) to retrieve ALL metadatas, including those you might not care about (reports, translations...)\n\nAs we can retrieve only 10000 files by call, the list of all metadatas will be chunked to make multiple calls (and take more time than filtered mode)\n\n- if you use `--full-apply-filters` , manifest/package-skip-items.xml and MONITORING_BACKUP_SKIP_METADATA_TYPES filters will be applied anyway\n- if you use `--exclude-namespaces` , namespaced items will be ignored\n\n_With those both options, it's like if you are not using --full, but with chunked metadata download_\n\n## In CI/CD\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-metadata-backup/) and can output Grafana, Slack and MsTeams Notifications.\n\n## Documentation\n\n[Doc generation (including visual flows)](https://sfdx-hardis.cloudity.com/hardis/doc/project2markdown/) is triggered at the end of the command.\n\nIf you want to also upload HTML Documentation on your Salesforce Org as static resource, use variable **SFDX_HARDIS_DOC_DEPLOY_TO_ORG=\"true\"**\n\nIf you want to also upload HTML Documentation on Cloudflare, use variable **SFDX_HARDIS_DOC_DEPLOY_TO_CLOUDFLARE=\"true\"**\n\nIf Flow history doc always display a single state, you probably need to update your workflow configuration:\n\n- on Gitlab: Env variable [`GIT_FETCH_EXTRA_FLAGS: --depth 10000`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/.gitlab-ci.yml#L11)\n- on GitHub: [`fetch-depth: 0`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/.github/workflows/org-monitoring.yml#L58)\n- on Azure: [`fetchDepth: \"0\"`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/azure-pipelines.yml#L39)\n- on Bitbucket: [`step: clone: depth: full`](https://github.com/hardisgroupcom/sfdx-hardis/blob/main/defaults/monitoring/bitbucket-pipelines.yml#L18)\n",
       "examples": [
         "$ sf hardis:org:monitor:backup",
         "$ sf hardis:org:monitor:backup --full",
@@ -7572,12 +7572,13 @@
         "flow:purge:org:hardis"
       ]
     },
-    "hardis:org:test:apex": {
+    "hardis:org:retrieve:packageconfig": {
       "aliases": [],
       "args": {},
-      "description": "Run apex tests in Salesforce org\n\nIf following configuration is defined, it will fail if apex coverage target is not reached:\n\n- Env `APEX_TESTS_MIN_COVERAGE_ORG_WIDE` or `.sfdx-hardis` property `apexTestsMinCoverageOrgWide`\n- Env `APEX_TESTS_MIN_COVERAGE_ORG_WIDE` or `.sfdx-hardis` property `apexTestsMinCoverageOrgWide`\n\nYou can override env var SFDX_TEST_WAIT_MINUTES to wait more than 60 minutes.\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-apex-tests/) and can output Grafana, Slack and MsTeams Notifications.\n",
+      "description": "Retrieve package configuration from an org",
       "examples": [
-        "$ sf hardis:org:test:apex"
+        "$ sf hardis:org:retrieve:packageconfig",
+        "sf hardis:org:retrieve:packageconfig -u myOrg"
       ],
       "flags": {
         "json": {
@@ -7595,21 +7596,6 @@
           "multiple": false,
           "type": "option"
         },
-        "testlevel": {
-          "char": "l",
-          "description": "Level of tests to apply to validate deployment",
-          "name": "testlevel",
-          "default": "RunLocalTests",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "NoTestRun",
-            "RunSpecifiedTests",
-            "RunLocalTests",
-            "RunAllTestsInOrg"
-          ],
-          "type": "option"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -7648,57 +7634,57 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:test:apex",
+      "id": "hardis:org:retrieve:packageconfig",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Run apex tests",
+      "title": "Retrieve package configuration from an org",
+      "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
         "org",
-        "test",
-        "apex.js"
+        "retrieve",
+        "packageconfig.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:test:apex",
-        "org:hardis:test:apex",
-        "org:test:hardis:apex",
-        "org:test:apex:hardis",
-        "hardis:test:org:apex",
-        "test:hardis:org:apex",
-        "test:org:hardis:apex",
-        "test:org:apex:hardis",
-        "hardis:test:apex:org",
-        "test:hardis:apex:org",
-        "test:apex:hardis:org",
-        "test:apex:org:hardis",
-        "hardis:org:apex:test",
-        "org:hardis:apex:test",
-        "org:apex:hardis:test",
-        "org:apex:test:hardis",
-        "hardis:apex:org:test",
-        "apex:hardis:org:test",
-        "apex:org:hardis:test",
-        "apex:org:test:hardis",
-        "hardis:apex:test:org",
-        "apex:hardis:test:org",
-        "apex:test:hardis:org",
-        "apex:test:org:hardis"
+        "hardis:org:retrieve:packageconfig",
+        "org:hardis:retrieve:packageconfig",
+        "org:retrieve:hardis:packageconfig",
+        "org:retrieve:packageconfig:hardis",
+        "hardis:retrieve:org:packageconfig",
+        "retrieve:hardis:org:packageconfig",
+        "retrieve:org:hardis:packageconfig",
+        "retrieve:org:packageconfig:hardis",
+        "hardis:retrieve:packageconfig:org",
+        "retrieve:hardis:packageconfig:org",
+        "retrieve:packageconfig:hardis:org",
+        "retrieve:packageconfig:org:hardis",
+        "hardis:org:packageconfig:retrieve",
+        "org:hardis:packageconfig:retrieve",
+        "org:packageconfig:hardis:retrieve",
+        "org:packageconfig:retrieve:hardis",
+        "hardis:packageconfig:org:retrieve",
+        "packageconfig:hardis:org:retrieve",
+        "packageconfig:org:hardis:retrieve",
+        "packageconfig:org:retrieve:hardis",
+        "hardis:packageconfig:retrieve:org",
+        "packageconfig:hardis:retrieve:org",
+        "packageconfig:retrieve:hardis:org",
+        "packageconfig:retrieve:org:hardis"
       ]
     },
-    "hardis:org:retrieve:packageconfig": {
+    "hardis:org:test:apex": {
       "aliases": [],
       "args": {},
-      "description": "Retrieve package configuration from an org",
+      "description": "Run apex tests in Salesforce org\n\nIf following configuration is defined, it will fail if apex coverage target is not reached:\n\n- Env `APEX_TESTS_MIN_COVERAGE_ORG_WIDE` or `.sfdx-hardis` property `apexTestsMinCoverageOrgWide`\n- Env `APEX_TESTS_MIN_COVERAGE_ORG_WIDE` or `.sfdx-hardis` property `apexTestsMinCoverageOrgWide`\n\nYou can override env var SFDX_TEST_WAIT_MINUTES to wait more than 60 minutes.\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-apex-tests/) and can output Grafana, Slack and MsTeams Notifications.\n",
       "examples": [
-        "$ sf hardis:org:retrieve:packageconfig",
-        "sf hardis:org:retrieve:packageconfig -u myOrg"
+        "$ sf hardis:org:test:apex"
       ],
       "flags": {
         "json": {
@@ -7716,6 +7702,21 @@
           "multiple": false,
           "type": "option"
         },
+        "testlevel": {
+          "char": "l",
+          "description": "Level of tests to apply to validate deployment",
+          "name": "testlevel",
+          "default": "RunLocalTests",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "NoTestRun",
+            "RunSpecifiedTests",
+            "RunLocalTests",
+            "RunAllTestsInOrg"
+          ],
+          "type": "option"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -7754,49 +7755,48 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:retrieve:packageconfig",
+      "id": "hardis:org:test:apex",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Retrieve package configuration from an org",
-      "requiresProject": false,
+      "title": "Run apex tests",
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
         "org",
-        "retrieve",
-        "packageconfig.js"
+        "test",
+        "apex.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:retrieve:packageconfig",
-        "org:hardis:retrieve:packageconfig",
-        "org:retrieve:hardis:packageconfig",
-        "org:retrieve:packageconfig:hardis",
-        "hardis:retrieve:org:packageconfig",
-        "retrieve:hardis:org:packageconfig",
-        "retrieve:org:hardis:packageconfig",
-        "retrieve:org:packageconfig:hardis",
-        "hardis:retrieve:packageconfig:org",
-        "retrieve:hardis:packageconfig:org",
-        "retrieve:packageconfig:hardis:org",
-        "retrieve:packageconfig:org:hardis",
-        "hardis:org:packageconfig:retrieve",
-        "org:hardis:packageconfig:retrieve",
-        "org:packageconfig:hardis:retrieve",
-        "org:packageconfig:retrieve:hardis",
-        "hardis:packageconfig:org:retrieve",
-        "packageconfig:hardis:org:retrieve",
-        "packageconfig:org:hardis:retrieve",
-        "packageconfig:org:retrieve:hardis",
-        "hardis:packageconfig:retrieve:org",
-        "packageconfig:hardis:retrieve:org",
-        "packageconfig:retrieve:hardis:org",
-        "packageconfig:retrieve:org:hardis"
+        "hardis:org:test:apex",
+        "org:hardis:test:apex",
+        "org:test:hardis:apex",
+        "org:test:apex:hardis",
+        "hardis:test:org:apex",
+        "test:hardis:org:apex",
+        "test:org:hardis:apex",
+        "test:org:apex:hardis",
+        "hardis:test:apex:org",
+        "test:hardis:apex:org",
+        "test:apex:hardis:org",
+        "test:apex:org:hardis",
+        "hardis:org:apex:test",
+        "org:hardis:apex:test",
+        "org:apex:hardis:test",
+        "org:apex:test:hardis",
+        "hardis:apex:org:test",
+        "apex:hardis:org:test",
+        "apex:org:hardis:test",
+        "apex:org:test:hardis",
+        "hardis:apex:test:org",
+        "apex:hardis:test:org",
+        "apex:test:hardis:org",
+        "apex:test:org:hardis"
       ]
     },
     "hardis:org:user:activateinvalid": {
@@ -14517,5 +14517,5 @@
       ]
     }
   },
-  "version": "5.25.1"
+  "version": "5.26.0"
 }