sfdx-hardis 6.15.1-beta202512081818.0 → 6.15.2-beta202512140349.0

package/oclif.manifest.json

@@ -132,12 +132,13 @@
         "clear:cache:hardis"
       ]
     },
-    "hardis:config:get": {
+    "hardis:auth:login": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Retrieves and displays the sfdx-hardis configuration for a specified level.**\n\nThis command allows you to inspect the configuration that is currently in effect for your project, which is useful for debugging and understanding how sfdx-hardis will behave.\n\n- **Configuration levels:** It can retrieve configuration from three different levels:\n  - **Project:** The configuration defined in the project's `.sfdx-hardis.yml` file.\n  - **Branch:** The configuration defined in a branch-specific configuration file (e.g., `.sfdx-hardis.production.yml`).\n  - **User:** The global user-level configuration.\n\n## Technical explanations\n\nThe command's logic is straightforward:\n\n- **`getConfig` function:** It calls the `getConfig` utility function, passing the desired configuration level as an argument.\n- **Configuration loading:** The `getConfig` function is responsible for finding the appropriate configuration file, reading its contents, and parsing it as YAML or JSON.\n- **Output:** The retrieved configuration is then displayed to the user as a JSON string.\n",
+      "description": "\n## Command Behavior\n\n**Authenticates to a Salesforce org, primarily designed for CI/CD workflows.**\n\nThis command facilitates secure and automated logins to Salesforce organizations within continuous integration and continuous delivery pipelines. It leverages pre-configured authentication details, ensuring that CI/CD processes can interact with Salesforce without manual intervention.\n\nKey aspects:\n\n- **Configuration-Driven:** It relies on authentication variables and files set up by dedicated configuration commands:\n  - For CI/CD repositories: [Configure Org CI Authentication](https://sfdx-hardis.cloudity.com/hardis/project/configure/auth/)\n  - For Monitoring repositories: [Configure Org Monitoring](https://sfdx-hardis.cloudity.com/hardis/org/configure/monitoring/)\n- **Technical Org Support:** Supports authentication to a 'technical org' (e.g., for calling Agentforce from another org) by utilizing the `SFDX_AUTH_URL_TECHNICAL_ORG` environment variable. If this variable is set, the command authenticates to this org with the alias `TECHNICAL_ORG`.\n\nTo obtain the `SFDX_AUTH_URL_TECHNICAL_ORG` value, you can run `sf org display --verbose --json` and copy the `sfdxAuthUrl` field from the output.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical flow involves:\n\n- **Flag Parsing:** It parses command-line flags such as `instanceurl`, `devhub`, `scratchorg`, and `debug` to determine the authentication context.\n- **Authentication Hook:** It triggers an internal authentication hook (`this.config.runHook('auth', ...`)) which is responsible for executing the actual authentication logic based on the provided flags (e.g., whether it's a Dev Hub or a scratch org).\n- **Environment Variable Check:** It checks for the presence of `SFDX_AUTH_URL_TECHNICAL_ORG` or `TECHNICAL_ORG_ALIAS` environment variables.\n- **`authOrg` Utility:** If a technical org is configured, it calls the `authOrg` utility function to perform the authentication for that specific org, ensuring it's connected and available for subsequent operations.\n- **Salesforce CLI Integration:** It integrates with the Salesforce CLI's authentication mechanisms to establish and manage org connections.\n</details>\n",
       "examples": [
-        "$ sf hardis:project:deploy:sources:metadata"
+        "$ sf hardis:auth:login",
+        "CI=true CI_COMMIT_REF_NAME=monitoring_myclient sf hardis:auth:login"
       ],
       "flags": {
         "json": {
@@ -155,20 +156,28 @@
           "multiple": false,
           "type": "option"
         },
-        "level": {
-          "char": "l",
-          "description": "project,branch or user",
-          "name": "level",
-          "default": "project",
+        "instanceurl": {
+          "char": "r",
+          "description": "URL of org instance",
+          "name": "instanceurl",
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "project",
-            "branch",
-            "user"
-          ],
           "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)",
@@ -192,39 +201,38 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:config:get",
+      "id": "hardis:auth:login",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Deploy metadata sources to org",
+      "title": "Login",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "config",
-        "get.js"
+        "auth",
+        "login.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:config:get",
-        "config:hardis:get",
-        "config:get:hardis",
-        "hardis:get:config",
-        "get:hardis:config",
-        "get:config:hardis"
+        "hardis:auth:login",
+        "auth:hardis:login",
+        "auth:login:hardis",
+        "hardis:login:auth",
+        "login:hardis:auth",
+        "login:auth:hardis"
       ]
     },
-    "hardis:auth:login": {
+    "hardis:config:get": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Authenticates to a Salesforce org, primarily designed for CI/CD workflows.**\n\nThis command facilitates secure and automated logins to Salesforce organizations within continuous integration and continuous delivery pipelines. It leverages pre-configured authentication details, ensuring that CI/CD processes can interact with Salesforce without manual intervention.\n\nKey aspects:\n\n- **Configuration-Driven:** It relies on authentication variables and files set up by dedicated configuration commands:\n  - For CI/CD repositories: [Configure Org CI Authentication](https://sfdx-hardis.cloudity.com/hardis/project/configure/auth/)\n  - For Monitoring repositories: [Configure Org Monitoring](https://sfdx-hardis.cloudity.com/hardis/org/configure/monitoring/)\n- **Technical Org Support:** Supports authentication to a 'technical org' (e.g., for calling Agentforce from another org) by utilizing the `SFDX_AUTH_URL_TECHNICAL_ORG` environment variable. If this variable is set, the command authenticates to this org with the alias `TECHNICAL_ORG`.\n\nTo obtain the `SFDX_AUTH_URL_TECHNICAL_ORG` value, you can run `sf org display --verbose --json` and copy the `sfdxAuthUrl` field from the output.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical flow involves:\n\n- **Flag Parsing:** It parses command-line flags such as `instanceurl`, `devhub`, `scratchorg`, and `debug` to determine the authentication context.\n- **Authentication Hook:** It triggers an internal authentication hook (`this.config.runHook('auth', ...`)) which is responsible for executing the actual authentication logic based on the provided flags (e.g., whether it's a Dev Hub or a scratch org).\n- **Environment Variable Check:** It checks for the presence of `SFDX_AUTH_URL_TECHNICAL_ORG` or `TECHNICAL_ORG_ALIAS` environment variables.\n- **`authOrg` Utility:** If a technical org is configured, it calls the `authOrg` utility function to perform the authentication for that specific org, ensuring it's connected and available for subsequent operations.\n- **Salesforce CLI Integration:** It integrates with the Salesforce CLI's authentication mechanisms to establish and manage org connections.\n</details>\n",
+      "description": "\n## Command Behavior\n\n**Retrieves and displays the sfdx-hardis configuration for a specified level.**\n\nThis command allows you to inspect the configuration that is currently in effect for your project, which is useful for debugging and understanding how sfdx-hardis will behave.\n\n- **Configuration levels:** It can retrieve configuration from three different levels:\n  - **Project:** The configuration defined in the project's `.sfdx-hardis.yml` file.\n  - **Branch:** The configuration defined in a branch-specific configuration file (e.g., `.sfdx-hardis.production.yml`).\n  - **User:** The global user-level configuration.\n\n## Technical explanations\n\nThe command's logic is straightforward:\n\n- **`getConfig` function:** It calls the `getConfig` utility function, passing the desired configuration level as an argument.\n- **Configuration loading:** The `getConfig` function is responsible for finding the appropriate configuration file, reading its contents, and parsing it as YAML or JSON.\n- **Output:** The retrieved configuration is then displayed to the user as a JSON string.\n",
       "examples": [
-        "$ sf hardis:auth:login",
-        "CI=true CI_COMMIT_REF_NAME=monitoring_myclient sf hardis:auth:login"
+        "$ sf hardis:project:deploy:sources:metadata"
       ],
       "flags": {
         "json": {
@@ -242,28 +250,20 @@
           "multiple": false,
           "type": "option"
         },
-        "instanceurl": {
-          "char": "r",
-          "description": "URL of org instance",
-          "name": "instanceurl",
+        "level": {
+          "char": "l",
+          "description": "project,branch or user",
+          "name": "level",
+          "default": "project",
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "project",
+            "branch",
+            "user"
+          ],
           "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)",
@@ -287,30 +287,30 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:auth:login",
+      "id": "hardis:config:get",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Login",
+      "title": "Deploy metadata sources to org",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "auth",
-        "login.js"
+        "config",
+        "get.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:auth:login",
-        "auth:hardis:login",
-        "auth:login:hardis",
-        "hardis:login:auth",
-        "login:hardis:auth",
-        "login:auth:hardis"
+        "hardis:config:get",
+        "config:hardis:get",
+        "config:get:hardis",
+        "hardis:get:config",
+        "get:hardis:config",
+        "get:config:hardis"
       ]
     },
     "hardis:doc:fieldusage": {
@@ -3035,12 +3035,12 @@
         "lint:project:hardis"
       ]
     },
-    "hardis:source:deploy": {
+    "hardis:scratch:create": {
       "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",
+      "description": "\n## Command Behavior\n\n**Creates and fully initializes a Salesforce scratch org with complete development environment setup.**\n\nThis command is a comprehensive scratch org provisioning tool that automates the entire process of creating, configuring, and initializing a Salesforce scratch org for development work. It handles everything from basic org creation to advanced configuration including package installation, metadata deployment, and data initialization.\n\nKey functionalities:\n\n- **Intelligent Org Management:** Automatically generates unique scratch org aliases based on username, git branch, and timestamp, with options to reuse existing orgs or force creation of new ones.\n- **Scratch Org Pool Integration:** Supports fetching pre-configured scratch orgs from pools for faster development cycles and CI/CD optimization.\n- **Custom Scratch Definition:** Dynamically builds project-scratch-def.json files with user-specific configurations including email, username patterns, and org shape settings (set variable **SCRATCH_ORG_SHAPE** to use org shapes).\n- **Package Installation:** Automatically installs all configured packages defined in `installedPackages` configuration property.\n- **Metadata Deployment:** Pushes source code and deploys metadata using optimized deployment strategies for scratch org environments.\n- **Permission Set Assignment:** Assigns specified permission sets defined in `initPermissionSets` configuration to the scratch org user.\n- **Apex Script Execution:** Runs custom Apex initialization scripts defined in `scratchOrgInitApexScripts` for org-specific setup.\n- **Data Loading:** Loads initial data using SFDMU data packages from `dataPackages` configuration for realistic development environments.\n- **User Configuration:** Automatically configures the scratch org admin user with proper names, email, country settings, and marketing user permissions.\n- **Password Generation:** Creates and stores secure passwords for easy scratch org access during development.\n- **CI/CD Integration:** Provides specialized handling for continuous integration environments including automated cleanup and pool management.\n- **Error Handling:** Comprehensive error recovery including scratch org cleanup on failure and detailed troubleshooting messages.\n\nThe command configuration can be customized using:\n\n- `config/.sfdx-hardis.yml` file with properties like `installedPackages`, `initPermissionSets`, `scratchOrgInitApexScripts`, and `dataPackages`.\n- Environment variable **SCRATCH_ORG_SHAPE** with shape org id, if you want to use org shapes\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Configuration Management:** Loads hierarchical configuration from `.sfdx-hardis.yml`, branch-specific, and user-specific configuration files using `getConfig('user')`.\n- **Alias Generation Logic:** Creates intelligent scratch org aliases using username, git branch, timestamp patterns with CI and pool prefixes for different environments.\n- **Scratch Org Definition Building:** Dynamically constructs `project-scratch-def.json` with user email, custom usernames, org shapes, and feature flags like StateAndCountryPicklist and MarketingUser.\n- **Pool Integration:** Implements scratch org pool fetching using `fetchScratchOrg` for rapid org provisioning in development and CI environments.\n- **Salesforce CLI Integration:** Executes `sf org create scratch` commands with proper parameter handling including wait times, duration, and dev hub targeting.\n- **Package Installation Pipeline:** Uses `installPackages` utility to install managed and unmanaged packages with dependency resolution and error handling.\n- **Metadata Deployment:** Leverages `initOrgMetadatas` for optimized source pushing and metadata deployment specific to scratch org environments.\n- **Permission Set Assignment:** Implements `initPermissionSetAssignments` for automated permission set assignment to scratch org users.\n- **Apex Script Execution:** Runs custom Apex initialization scripts using `initApexScripts` for org-specific configuration and setup.\n- **Data Loading Integration:** Uses SFDMU integration through `initOrgData` for comprehensive data loading from configured data packages.\n- **User Management:** Performs SOQL queries and DML operations to configure scratch org users with proper names, emails, country codes, and permission flags.\n- **Authentication Management:** Handles SFDX auth URL generation and storage for CI/CD environments and scratch org pool management.\n- **Error Recovery:** Implements comprehensive error handling with scratch org cleanup, pool management, and detailed error messaging for troubleshooting.\n- **WebSocket Integration:** Provides real-time status updates and file reporting through WebSocket connections for VS Code extension integration.\n</details>\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"
+        "$ sf hardis:scratch:create"
       ],
       "flags": {
         "json": {
@@ -3058,205 +3058,213 @@
           "multiple": false,
           "type": "option"
         },
-        "checkonly": {
-          "char": "c",
-          "description": "checkonly",
-          "name": "checkonly",
+        "forcenew": {
+          "char": "n",
+          "description": "If an existing scratch org exists, do not reuse it but create a new one",
+          "name": "forcenew",
           "allowNo": false,
           "type": "boolean"
         },
-        "soapdeploy": {
-          "description": "soapDeploy",
-          "name": "soapdeploy",
+        "pool": {
+          "description": "Creates the scratch org for a scratch org pool",
+          "name": "pool",
           "allowNo": false,
           "type": "boolean"
         },
-        "wait": {
-          "char": "w",
-          "description": "wait",
-          "name": "wait",
-          "default": 60,
+        "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"
         },
-        "testlevel": {
-          "char": "l",
-          "description": "testlevel",
-          "name": "testlevel",
-          "default": "NoTestRun",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "NoTestRun",
-            "RunSpecifiedTests",
-            "RunLocalTests",
-            "RunAllTestsInOrg"
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
+          "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"
+      ],
+      "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": "## Command Behavior\n\n**Provides an assisted menu to delete Salesforce scratch orgs associated with a Dev Hub.**\n\nThis command simplifies the process of cleaning up your Salesforce development environments by allowing you to easily select and delete multiple scratch orgs. This is crucial for managing your scratch org limits and ensuring that you don't accumulate unnecessary or expired orgs.\n\nKey functionalities:\n\n- **Interactive Scratch Org Selection:** Displays a list of all active scratch orgs linked to your Dev Hub, including their usernames, instance URLs, and last used dates.\n- **Multi-Selection:** Allows you to select multiple scratch orgs for deletion.\n- **Confirmation Prompt:** Prompts for confirmation before proceeding with the deletion, ensuring that you don't accidentally delete important orgs.\n- **Dev Hub Integration:** Works with your configured Dev Hub to manage scratch orgs.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce CLI Integration:** It executes the `sf org list` command to retrieve a list of all scratch orgs associated with the current Dev Hub. It then filters this list to show only active orgs.\n- **Interactive Prompts:** Uses the `prompts` library to present a multi-select menu of scratch orgs to the user.\n- **Scratch Org Deletion:** For each selected scratch org, it executes the `sf org delete scratch --no-prompt` command to perform the deletion.\n- **Error Handling:** Includes basic error handling for Salesforce CLI commands.\n- **Data Sorting:** Sorts the list of scratch orgs by username, alias, and instance URL for better readability in the interactive menu.\n</details>\n",
+      "examples": [
+        "$ sf hardis:scratch:delete"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "runtests": {
-          "char": "r",
-          "description": "runTests",
-          "name": "runtests",
-          "default": [],
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
           "hasDynamicHelp": false,
-          "multiple": true,
+          "multiple": false,
           "type": "option"
         },
-        "ignoreerrors": {
-          "description": "ignoreErrors",
-          "name": "ignoreerrors",
+        "debug": {
+          "char": "d",
+          "description": "Activate debug mode (more logs)",
+          "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
-        "ignorewarnings": {
-          "char": "g",
-          "description": "ignoreWarnings",
-          "name": "ignorewarnings",
+        "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"
         },
-        "validateddeployrequestid": {
-          "char": "q",
-          "description": "validateDeployRequestId",
-          "exclusive": [
-            "manifest",
-            "metadata",
-            "sourcepath",
-            "checkonly",
-            "testlevel",
-            "runtests",
-            "ignoreerrors",
-            "ignorewarnings"
-          ],
-          "name": "validateddeployrequestid",
-          "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",
-          "exclusive": [
-            "manifest",
-            "metadata"
-          ],
-          "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"
-        },
-        "predestructivechanges": {
-          "dependsOn": [
-            "manifest"
-          ],
-          "description": "predestructivechanges",
-          "name": "predestructivechanges",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "postdestructivechanges": {
-          "dependsOn": [
-            "manifest"
+        "target-dev-hub": {
+          "aliases": [
+            "targetdevhubusername"
           ],
-          "description": "postdestructivechanges",
-          "name": "postdestructivechanges",
-          "hasDynamicHelp": false,
+          "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"
-        },
-        "tracksource": {
-          "char": "t",
-          "description": "tracksource",
-          "exclusive": [
-            "checkonly",
-            "validateddeployrequestid"
-          ],
-          "name": "tracksource",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "forceoverwrite": {
-          "char": "f",
-          "dependsOn": [
-            "tracksource"
-          ],
-          "description": "forceoverwrite",
-          "name": "forceoverwrite",
+        }
+      },
+      "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": "\n## Command Behavior\n\n**Pulls metadata changes from your scratch org or source-tracked sandbox into your local project files.**\n\nThis command is essential for synchronizing your local development environment with the changes you've made directly in your Salesforce org. After pulling, you can then stage and commit the relevant files to your version control system.\n\nKey features and considerations:\n\n- **Underlying Command:** Internally, this command executes `sf project retrieve start` to fetch the metadata.\n- **Error Handling:** If the pull operation encounters errors, it offers to automatically add the problematic items to your `.forceignore` file and then attempts to pull again, helping you resolve conflicts and ignore unwanted metadata.\n- **Missing Updates:** If you don't see certain updated items in the pull results, you might need to manually retrieve them using the Salesforce Extension's **Org Browser** or the **Salesforce CLI** directly. Refer to the [Retrieve Metadatas documentation](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-publish-task/#retrieve-metadatas) for more details.\n- **Automatic Retrieval:** You can configure the `autoRetrieveWhenPull` property in your `.sfdx-hardis.yml` file to always retrieve specific metadata types (e.g., `CustomApplication`) that might not always be detected as updates by `project:retrieve:start`.\n\nExample `.sfdx-hardis.yml` configuration for `autoRetrieveWhenPull`:\n```yaml\nautoRetrieveWhenPull:\n  - CustomApplication:MyCustomApplication\n  - CustomApplication:MyOtherCustomApplication\n  - CustomApplication:MyThirdCustomApp\n```\n\nFor a visual explanation of the process, watch 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<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation focuses on robust metadata synchronization:\n\n- **Salesforce CLI Wrapper:** It acts as a wrapper around the standard Salesforce CLI `sf project retrieve start` command, providing enhanced error handling and configuration options.\n- **Force Source Pull Utility:** The core logic resides in the `forceSourcePull` utility function, which orchestrates the retrieval process, including handling `.forceignore` updates.\n- **Configuration Integration:** It reads the `autoRetrieveWhenPull` setting from the project's `.sfdx-hardis.yml` to determine additional metadata to retrieve automatically.\n- **User Feedback:** Provides clear messages to the user regarding the pull status and guidance for troubleshooting.\n</details>\n",
+      "examples": [
+        "$ sf hardis:scratch:pull"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
           "allowNo": false,
           "type": "boolean"
         },
-        "resultsdir": {
-          "description": "resultsdir",
-          "name": "resultsdir",
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
           "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": {
-          "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",
@@ -3275,35 +3283,39 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:deploy",
+      "id": "hardis:scratch:pull",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
+      "title": "Scratch PULL",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "source",
-        "deploy.js"
+        "scratch",
+        "pull.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:deploy",
-        "source:hardis:deploy",
-        "source:deploy:hardis",
-        "hardis:deploy:source",
-        "deploy:hardis:source",
-        "deploy:source:hardis"
+        "hardis:scratch:pull",
+        "scratch:hardis:pull",
+        "scratch:pull:hardis",
+        "hardis:pull:scratch",
+        "pull:hardis:scratch",
+        "pull:scratch:hardis"
       ]
     },
-    "hardis:source:push": {
+    "hardis:scratch:push": {
       "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": "## Command Behavior\n\n**Pushes local Salesforce DX source files to a scratch org or source-tracked sandbox.**\n\nThis command is a fundamental operation in Salesforce DX development, allowing developers to synchronize their local codebase with their development org. It ensures that changes made locally are reflected in the scratch org, enabling testing and validation.\n\nKey functionalities:\n\n- **Source Synchronization:** Deploys all local changes (metadata and code) to the target scratch org.\n- **Underlying Command:** Internally, this command executes `sf project deploy start` to perform the push operation.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce CLI Wrapper:** It acts as a wrapper around the standard Salesforce CLI `sf project deploy start` command.\n- **`forceSourcePush` Utility:** The core logic resides in the `forceSourcePush` utility function, which orchestrates the deployment process.\n- **Connection Handling:** It uses the connection to the target org to perform the push operation.\n</details>\n",
+      "examples": [
+        "$ sf hardis:scratch:push"
+      ],
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -3320,48 +3332,26 @@
           "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": {
-          "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",
@@ -3380,36 +3370,39 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:push",
+      "id": "hardis:scratch:push",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
+      "title": "Scratch PUSH",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "source",
+        "scratch",
         "push.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:push",
-        "source:hardis:push",
-        "source:push:hardis",
-        "hardis:push:source",
-        "push:hardis:source",
-        "push:source:hardis"
+        "hardis:scratch:push",
+        "scratch:hardis:push",
+        "scratch:push:hardis",
+        "hardis:push:scratch",
+        "push:hardis:scratch",
+        "push:scratch:hardis"
       ]
     },
-    "hardis:source:retrieve": {
+    "hardis:source:deploy": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**A wrapper command for Salesforce CLI's `sf project retrieve start` (formerly `sfdx force:source:retrieve`), with enhanced interactive features.**\n\nThis command facilitates the retrieval of metadata from a Salesforce org into your local project. It provides an assisted experience, especially when no specific retrieval constraints are provided.\n\nKey features:\n\n- **Assisted Metadata Selection:** If no `sourcepath`, `manifest`, `metadata`, or `packagenames` flags are specified, an interactive menu will prompt you to select the metadata types you wish to retrieve.\n- **Assisted Org Selection:** If no target org is specified, an interactive menu will guide you to choose an org for the retrieval operation.\n- **Backward Compatibility:** While this command wraps the newer `sf project retrieve start`, it maintains compatibility with the older `sfdx force:source:retrieve` flags.\n\n**Important Note:** The underlying Salesforce CLI command `sfdx force:source:retrieve` is being deprecated by Salesforce in November 2024. It is recommended to migrate to `sf project retrieve start` for future compatibility. See [Salesforce CLI Migration Guide](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_mig_deploy_retrieve.htm) for more information.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThis command acts as an intelligent wrapper around the Salesforce CLI's source retrieval functionality:\n\n- **Command Wrapping:** It uses the `wrapSfdxCoreCommand` utility to execute the `sfdx force:source:retrieve` (or its equivalent `sf project retrieve start`) command, passing through all relevant flags and arguments.\n- **Interactive Prompts:** It leverages `MetadataUtils.promptMetadataTypes()` and `promptOrgUsernameDefault()` to provide interactive menus for metadata and org selection when the user does not provide them as flags.\n- **Argument Transformation:** It dynamically constructs the command-line arguments for the underlying Salesforce CLI command based on user selections and provided flags.\n- **Error Handling:** It includes basic error handling, such as prompting the user to re-select an org if an issue occurs during org selection.\n- **Deprecation Warning:** It explicitly logs warnings about the deprecation of `sfdx force:source:retrieve` to inform users about upcoming changes.\n</details>\n",
-      "examples": [],
+      "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"
+      ],
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -3426,12 +3419,99 @@
           "multiple": false,
           "type": "option"
         },
-        "apiversion": {
-          "char": "a",
-          "description": "Override the api version used for api requests made by this command",
-          "name": "apiversion",
+        "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",
+          "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": {
@@ -3446,17 +3526,9 @@
           "multiple": true,
           "type": "option"
         },
-        "wait": {
-          "char": "w",
-          "description": "wait",
-          "name": "wait",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "manifest": {
           "char": "x",
-          "description": "manifest",
+          "description": "flagsLong.manifest",
           "exclusive": [
             "metadata",
             "sourcepath"
@@ -3466,29 +3538,33 @@
           "multiple": false,
           "type": "option"
         },
-        "metadata": {
-          "char": "m",
-          "description": "metadata",
-          "exclusive": [
-            "manifest",
-            "sourcepath"
+        "predestructivechanges": {
+          "dependsOn": [
+            "manifest"
           ],
-          "name": "metadata",
+          "description": "predestructivechanges",
+          "name": "predestructivechanges",
           "hasDynamicHelp": false,
-          "multiple": true,
+          "multiple": false,
           "type": "option"
         },
-        "packagenames": {
-          "char": "n",
-          "description": "packagenames",
-          "name": "packagenames",
+        "postdestructivechanges": {
+          "dependsOn": [
+            "manifest"
+          ],
+          "description": "postdestructivechanges",
+          "name": "postdestructivechanges",
           "hasDynamicHelp": false,
-          "multiple": true,
+          "multiple": false,
           "type": "option"
         },
         "tracksource": {
           "char": "t",
           "description": "tracksource",
+          "exclusive": [
+            "checkonly",
+            "validateddeployrequestid"
+          ],
           "name": "tracksource",
           "allowNo": false,
           "type": "boolean"
@@ -3503,141 +3579,56 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "verbose": {
-          "description": "verbose",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "debug": {
-          "char": "d",
-          "description": "debugMode",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "websocket": {
-          "description": "websocket",
-          "name": "websocket",
+        "resultsdir": {
+          "description": "resultsdir",
+          "name": "resultsdir",
           "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:source:retrieve",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "requiresProject": true,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "source",
-        "retrieve.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:source:retrieve",
-        "source:hardis:retrieve",
-        "source:retrieve:hardis",
-        "hardis:retrieve:source",
-        "retrieve:hardis:source",
-        "retrieve:source:hardis"
-      ]
-    },
-    "hardis:scratch:create": {
-      "aliases": [],
-      "args": {},
-      "description": "\n## Command Behavior\n\n**Creates and fully initializes a Salesforce scratch org with complete development environment setup.**\n\nThis command is a comprehensive scratch org provisioning tool that automates the entire process of creating, configuring, and initializing a Salesforce scratch org for development work. It handles everything from basic org creation to advanced configuration including package installation, metadata deployment, and data initialization.\n\nKey functionalities:\n\n- **Intelligent Org Management:** Automatically generates unique scratch org aliases based on username, git branch, and timestamp, with options to reuse existing orgs or force creation of new ones.\n- **Scratch Org Pool Integration:** Supports fetching pre-configured scratch orgs from pools for faster development cycles and CI/CD optimization.\n- **Custom Scratch Definition:** Dynamically builds project-scratch-def.json files with user-specific configurations including email, username patterns, and org shape settings (set variable **SCRATCH_ORG_SHAPE** to use org shapes).\n- **Package Installation:** Automatically installs all configured packages defined in `installedPackages` configuration property.\n- **Metadata Deployment:** Pushes source code and deploys metadata using optimized deployment strategies for scratch org environments.\n- **Permission Set Assignment:** Assigns specified permission sets defined in `initPermissionSets` configuration to the scratch org user.\n- **Apex Script Execution:** Runs custom Apex initialization scripts defined in `scratchOrgInitApexScripts` for org-specific setup.\n- **Data Loading:** Loads initial data using SFDMU data packages from `dataPackages` configuration for realistic development environments.\n- **User Configuration:** Automatically configures the scratch org admin user with proper names, email, country settings, and marketing user permissions.\n- **Password Generation:** Creates and stores secure passwords for easy scratch org access during development.\n- **CI/CD Integration:** Provides specialized handling for continuous integration environments including automated cleanup and pool management.\n- **Error Handling:** Comprehensive error recovery including scratch org cleanup on failure and detailed troubleshooting messages.\n\nThe command configuration can be customized using:\n\n- `config/.sfdx-hardis.yml` file with properties like `installedPackages`, `initPermissionSets`, `scratchOrgInitApexScripts`, and `dataPackages`.\n- Environment variable **SCRATCH_ORG_SHAPE** with shape org id, if you want to use org shapes\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Configuration Management:** Loads hierarchical configuration from `.sfdx-hardis.yml`, branch-specific, and user-specific configuration files using `getConfig('user')`.\n- **Alias Generation Logic:** Creates intelligent scratch org aliases using username, git branch, timestamp patterns with CI and pool prefixes for different environments.\n- **Scratch Org Definition Building:** Dynamically constructs `project-scratch-def.json` with user email, custom usernames, org shapes, and feature flags like StateAndCountryPicklist and MarketingUser.\n- **Pool Integration:** Implements scratch org pool fetching using `fetchScratchOrg` for rapid org provisioning in development and CI environments.\n- **Salesforce CLI Integration:** Executes `sf org create scratch` commands with proper parameter handling including wait times, duration, and dev hub targeting.\n- **Package Installation Pipeline:** Uses `installPackages` utility to install managed and unmanaged packages with dependency resolution and error handling.\n- **Metadata Deployment:** Leverages `initOrgMetadatas` for optimized source pushing and metadata deployment specific to scratch org environments.\n- **Permission Set Assignment:** Implements `initPermissionSetAssignments` for automated permission set assignment to scratch org users.\n- **Apex Script Execution:** Runs custom Apex initialization scripts using `initApexScripts` for org-specific configuration and setup.\n- **Data Loading Integration:** Uses SFDMU integration through `initOrgData` for comprehensive data loading from configured data packages.\n- **User Management:** Performs SOQL queries and DML operations to configure scratch org users with proper names, emails, country codes, and permission flags.\n- **Authentication Management:** Handles SFDX auth URL generation and storage for CI/CD environments and scratch org pool management.\n- **Error Recovery:** Implements comprehensive error handling with scratch org cleanup, pool management, and detailed error messaging for troubleshooting.\n- **WebSocket Integration:** Provides real-time status updates and file reporting through WebSocket connections for VS Code extension integration.\n</details>\n",
-      "examples": [
-        "$ sf hardis:scratch:create"
-      ],
-      "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.",
+        "coverageformatters": {
+          "description": "coverageformatters",
+          "name": "coverageformatters",
           "hasDynamicHelp": false,
-          "multiple": false,
+          "multiple": true,
           "type": "option"
         },
-        "forcenew": {
-          "char": "n",
-          "description": "If an existing scratch org exists, do not reuse it but create a new one",
-          "name": "forcenew",
+        "junit": {
+          "description": "junit",
+          "name": "junit",
           "allowNo": false,
           "type": "boolean"
         },
-        "pool": {
-          "description": "Creates the scratch org for a scratch org pool",
-          "name": "pool",
+        "checkcoverage": {
+          "description": "Check Apex org coverage",
+          "name": "checkcoverage",
           "allowNo": false,
           "type": "boolean"
         },
-        "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
+        "debug": {
+          "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-dev-hub": {
+        "target-org": {
           "aliases": [
-            "targetdevhubusername"
+            "targetusername",
+            "u"
           ],
-          "char": "v",
+          "char": "o",
           "deprecateAliases": true,
-          "name": "target-dev-hub",
+          "name": "target-org",
           "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.",
+          "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"
@@ -3645,42 +3636,35 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:scratch:create",
+      "id": "hardis:source:deploy",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Create and initialize scratch org",
       "requiresProject": true,
-      "requiresSfdxPlugins": [
-        "sfdmu"
-      ],
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "scratch",
-        "create.js"
+        "source",
+        "deploy.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:scratch:create",
-        "scratch:hardis:create",
-        "scratch:create:hardis",
-        "hardis:create:scratch",
-        "create:hardis:scratch",
-        "create:scratch:hardis"
+        "hardis:source:deploy",
+        "source:hardis:deploy",
+        "source:deploy:hardis",
+        "hardis:deploy:source",
+        "deploy:hardis:source",
+        "deploy:source:hardis"
       ]
     },
-    "hardis:scratch:delete": {
+    "hardis:source:push": {
       "aliases": [],
       "args": {},
-      "description": "## Command Behavior\n\n**Provides an assisted menu to delete Salesforce scratch orgs associated with a Dev Hub.**\n\nThis command simplifies the process of cleaning up your Salesforce development environments by allowing you to easily select and delete multiple scratch orgs. This is crucial for managing your scratch org limits and ensuring that you don't accumulate unnecessary or expired orgs.\n\nKey functionalities:\n\n- **Interactive Scratch Org Selection:** Displays a list of all active scratch orgs linked to your Dev Hub, including their usernames, instance URLs, and last used dates.\n- **Multi-Selection:** Allows you to select multiple scratch orgs for deletion.\n- **Confirmation Prompt:** Prompts for confirmation before proceeding with the deletion, ensuring that you don't accidentally delete important orgs.\n- **Dev Hub Integration:** Works with your configured Dev Hub to manage scratch orgs.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce CLI Integration:** It executes the `sf org list` command to retrieve a list of all scratch orgs associated with the current Dev Hub. It then filters this list to show only active orgs.\n- **Interactive Prompts:** Uses the `prompts` library to present a multi-select menu of scratch orgs to the user.\n- **Scratch Org Deletion:** For each selected scratch org, it executes the `sf org delete scratch --no-prompt` command to perform the deletion.\n- **Error Handling:** Includes basic error handling for Salesforce CLI commands.\n- **Data Sorting:** Sorts the list of scratch orgs by username, alias, and instance URL for better readability in the interactive menu.\n</details>\n",
-      "examples": [
-        "$ sf hardis:scratch:delete"
-      ],
+      "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.",
@@ -3697,111 +3681,48 @@
           "multiple": false,
           "type": "option"
         },
-        "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
-          "name": "debug",
+        "forceoverwrite": {
+          "char": "f",
+          "description": "forceoverwrite",
+          "name": "forceoverwrite",
           "allowNo": false,
           "type": "boolean"
         },
-        "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
-          "name": "websocket",
+        "wait": {
+          "char": "w",
+          "description": "wait",
+          "name": "wait",
+          "default": 60,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
+        "ignorewarnings": {
+          "char": "g",
+          "description": "ignorewarnings",
+          "name": "ignorewarnings",
           "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: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": "\n## Command Behavior\n\n**Pulls metadata changes from your scratch org or source-tracked sandbox into your local project files.**\n\nThis command is essential for synchronizing your local development environment with the changes you've made directly in your Salesforce org. After pulling, you can then stage and commit the relevant files to your version control system.\n\nKey features and considerations:\n\n- **Underlying Command:** Internally, this command executes `sf project retrieve start` to fetch the metadata.\n- **Error Handling:** If the pull operation encounters errors, it offers to automatically add the problematic items to your `.forceignore` file and then attempts to pull again, helping you resolve conflicts and ignore unwanted metadata.\n- **Missing Updates:** If you don't see certain updated items in the pull results, you might need to manually retrieve them using the Salesforce Extension's **Org Browser** or the **Salesforce CLI** directly. Refer to the [Retrieve Metadatas documentation](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-publish-task/#retrieve-metadatas) for more details.\n- **Automatic Retrieval:** You can configure the `autoRetrieveWhenPull` property in your `.sfdx-hardis.yml` file to always retrieve specific metadata types (e.g., `CustomApplication`) that might not always be detected as updates by `project:retrieve:start`.\n\nExample `.sfdx-hardis.yml` configuration for `autoRetrieveWhenPull`:\n```yaml\nautoRetrieveWhenPull:\n  - CustomApplication:MyCustomApplication\n  - CustomApplication:MyOtherCustomApplication\n  - CustomApplication:MyThirdCustomApp\n```\n\nFor a visual explanation of the process, watch 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<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation focuses on robust metadata synchronization:\n\n- **Salesforce CLI Wrapper:** It acts as a wrapper around the standard Salesforce CLI `sf project retrieve start` command, providing enhanced error handling and configuration options.\n- **Force Source Pull Utility:** The core logic resides in the `forceSourcePull` utility function, which orchestrates the retrieval process, including handling `.forceignore` updates.\n- **Configuration Integration:** It reads the `autoRetrieveWhenPull` setting from the project's `.sfdx-hardis.yml` to determine additional metadata to retrieve automatically.\n- **User Feedback:** Provides clear messages to the user regarding the pull status and guidance for troubleshooting.\n</details>\n",
-      "examples": [
-        "$ sf hardis:scratch:pull"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
+        "quiet": {
+          "description": "quiet",
+          "name": "quiet",
           "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)",
+          "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",
@@ -3820,39 +3741,36 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:scratch:pull",
+      "id": "hardis:source:push",
       "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",
+        "push.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:scratch:pull",
-        "scratch:hardis:pull",
-        "scratch:pull:hardis",
-        "hardis:pull:scratch",
-        "pull:hardis:scratch",
-        "pull:scratch:hardis"
+        "hardis:source:push",
+        "source:hardis:push",
+        "source:push:hardis",
+        "hardis:push:source",
+        "push:hardis:source",
+        "push:source:hardis"
       ]
     },
-    "hardis:scratch:push": {
+    "hardis:source:retrieve": {
       "aliases": [],
       "args": {},
-      "description": "## Command Behavior\n\n**Pushes local Salesforce DX source files to a scratch org or source-tracked sandbox.**\n\nThis command is a fundamental operation in Salesforce DX development, allowing developers to synchronize their local codebase with their development org. It ensures that changes made locally are reflected in the scratch org, enabling testing and validation.\n\nKey functionalities:\n\n- **Source Synchronization:** Deploys all local changes (metadata and code) to the target scratch org.\n- **Underlying Command:** Internally, this command executes `sf project deploy start` to perform the push operation.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce CLI Wrapper:** It acts as a wrapper around the standard Salesforce CLI `sf project deploy start` command.\n- **`forceSourcePush` Utility:** The core logic resides in the `forceSourcePush` utility function, which orchestrates the deployment process.\n- **Connection Handling:** It uses the connection to the target org to perform the push operation.\n</details>\n",
-      "examples": [
-        "$ sf hardis:scratch:push"
-      ],
+      "description": "\n## Command Behavior\n\n**A wrapper command for Salesforce CLI's `sf project retrieve start` (formerly `sfdx force:source:retrieve`), with enhanced interactive features.**\n\nThis command facilitates the retrieval of metadata from a Salesforce org into your local project. It provides an assisted experience, especially when no specific retrieval constraints are provided.\n\nKey features:\n\n- **Assisted Metadata Selection:** If no `sourcepath`, `manifest`, `metadata`, or `packagenames` flags are specified, an interactive menu will prompt you to select the metadata types you wish to retrieve.\n- **Assisted Org Selection:** If no target org is specified, an interactive menu will guide you to choose an org for the retrieval operation.\n- **Backward Compatibility:** While this command wraps the newer `sf project retrieve start`, it maintains compatibility with the older `sfdx force:source:retrieve` flags.\n\n**Important Note:** The underlying Salesforce CLI command `sfdx force:source:retrieve` is being deprecated by Salesforce in November 2024. It is recommended to migrate to `sf project retrieve start` for future compatibility. See [Salesforce CLI Migration Guide](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_mig_deploy_retrieve.htm) for more information.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThis command acts as an intelligent wrapper around the Salesforce CLI's source retrieval functionality:\n\n- **Command Wrapping:** It uses the `wrapSfdxCoreCommand` utility to execute the `sfdx force:source:retrieve` (or its equivalent `sf project retrieve start`) command, passing through all relevant flags and arguments.\n- **Interactive Prompts:** It leverages `MetadataUtils.promptMetadataTypes()` and `promptOrgUsernameDefault()` to provide interactive menus for metadata and org selection when the user does not provide them as flags.\n- **Argument Transformation:** It dynamically constructs the command-line arguments for the underlying Salesforce CLI command based on user selections and provided flags.\n- **Error Handling:** It includes basic error handling, such as prompting the user to re-select an org if an issue occurs during org selection.\n- **Deprecation Warning:** It explicitly logs warnings about the deprecation of `sfdx force:source:retrieve` to inform users about upcoming changes.\n</details>\n",
+      "examples": [],
       "flags": {
         "json": {
           "description": "Format output as json.",
@@ -3869,15 +3787,98 @@
           "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": {
+          "char": "n",
+          "description": "packagenames",
+          "name": "packagenames",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "tracksource": {
+          "char": "t",
+          "description": "tracksource",
+          "name": "tracksource",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "forceoverwrite": {
+          "char": "f",
+          "dependsOn": [
+            "tracksource"
+          ],
+          "description": "forceoverwrite",
+          "name": "forceoverwrite",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "verbose": {
+          "description": "verbose",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
-          "description": "Activate debug mode (more logs)",
+          "description": "debugMode",
           "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,
@@ -3907,30 +3908,29 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:scratch:push",
+      "id": "hardis:source:retrieve",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Scratch PUSH",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "scratch",
-        "push.js"
+        "source",
+        "retrieve.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:scratch:push",
-        "scratch:hardis:push",
-        "scratch:push:hardis",
-        "hardis:push:scratch",
-        "push:hardis:scratch",
-        "push:scratch:hardis"
+        "hardis:source:retrieve",
+        "source:hardis:retrieve",
+        "source:retrieve:hardis",
+        "hardis:retrieve:source",
+        "retrieve:hardis:source",
+        "retrieve:source:hardis"
       ]
     },
     "hardis:work:new": {
@@ -5808,6 +5808,121 @@
         "import:files:org:hardis"
       ]
     },
+    "hardis:org:fix:listviewmine": {
+      "aliases": [],
+      "args": {},
+      "description": "Fix listviews whose scope Mine has been replaced by Everything\n\n[![Invalid scope:Mine, not allowed ? Deploy your ListViews anyway !](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-invalid-scope-mine.jpg)](https://nicolas.vuillamy.fr/invalid-scope-mine-not-allowed-deploy-your-listviews-anyway-443aceca8ac7)\n\nList of ListViews can be:\n\n- read from .sfdx-hardis.yml file in property **listViewsToSetToMine**\n- sent in argument listviews\n\nNote: property **listViewsToSetToMine** can be auto-generated by command hardis:work:save if .sfdx-hardis.yml contains the following configuration\n\n```yaml\nautoCleanTypes:\n  - listViewsMine\n```\n\n- Example of sfdx-hardis.yml property `listViewsToSetToMine`:\n\n```yaml\nlistViewsToSetToMine:\n  - \"force-app/main/default/objects/Operation__c/listViews/MyCurrentOperations.listView-meta.xml\"\n  - \"force-app/main/default/objects/Operation__c/listViews/MyFinalizedOperations.listView-meta.xml\"\n  - \"force-app/main/default/objects/Opportunity/listViews/Default_Opportunity_Pipeline.listView-meta.xml\"\n  - \"force-app/main/default/objects/Opportunity/listViews/MyCurrentSubscriptions.listView-meta.xml\"\n  - \"force-app/main/default/objects/Opportunity/listViews/MySubscriptions.listView-meta.xml\"\n  - \"force-app/main/default/objects/Account/listViews/MyActivePartners.listView-meta.xml\"\n```\n\n- If manually written, this could also be:\n\n```yaml\nlistViewsToSetToMine:\n  - \"Operation__c:MyCurrentOperations\"\n  - \"Operation__c:MyFinalizedOperations\"\n  - \"Opportunity:Default_Opportunity_Pipeline\"\n  - \"Opportunity:MyCurrentSubscriptions\"\n  - \"Opportunity:MySubscriptions\"\n  - \"Account:MyActivePartners\"\n```\n\nTroubleshooting: if you need to run this command from an alpine-linux based docker image, use this workaround in your dockerfile:\n\n```dockerfile\n# Do not use puppeteer embedded chromium\nRUN apk add --update --no-cache chromium\nENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=\"true\"\nENV CHROMIUM_PATH=\"/usr/bin/chromium-browser\"\nENV PUPPETEER_EXECUTABLE_PATH=\"$\\{CHROMIUM_PATH}\" // remove \\ before {\n```\n",
+      "examples": [
+        "$ sf hardis:org:fix:listviewmine",
+        "$ sf hardis:org:fix:listviewmine --listviews Opportunity:MySubscriptions,Account:MyActivePartners"
+      ],
+      "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"
+        },
+        "listviews": {
+          "char": "l",
+          "description": "Comma-separated list of listviews following format Object:ListViewName\nExample: Contact:MyContacts,Contact:MyActiveContacts,Opportunity:MYClosedOpportunities",
+          "name": "listviews",
+          "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:fix:listviewmine",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Fix listviews with ",
+      "requiresProject": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "org",
+        "fix",
+        "listviewmine.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:org:fix:listviewmine",
+        "org:hardis:fix:listviewmine",
+        "org:fix:hardis:listviewmine",
+        "org:fix:listviewmine:hardis",
+        "hardis:fix:org:listviewmine",
+        "fix:hardis:org:listviewmine",
+        "fix:org:hardis:listviewmine",
+        "fix:org:listviewmine:hardis",
+        "hardis:fix:listviewmine:org",
+        "fix:hardis:listviewmine:org",
+        "fix:listviewmine:hardis:org",
+        "fix:listviewmine:org:hardis",
+        "hardis:org:listviewmine:fix",
+        "org:hardis:listviewmine:fix",
+        "org:listviewmine:hardis:fix",
+        "org:listviewmine:fix:hardis",
+        "hardis:listviewmine:org:fix",
+        "listviewmine:hardis:org:fix",
+        "listviewmine:org:hardis:fix",
+        "listviewmine:org:fix:hardis",
+        "hardis:listviewmine:fix:org",
+        "listviewmine:hardis:fix:org",
+        "listviewmine:fix:hardis:org",
+        "listviewmine:fix:org:hardis"
+      ]
+    },
     "hardis:org:diagnose:audittrail": {
       "aliases": [],
       "args": {},
@@ -7206,121 +7321,6 @@
         "unusedusers:diagnose:org:hardis"
       ]
     },
-    "hardis:org:fix:listviewmine": {
-      "aliases": [],
-      "args": {},
-      "description": "Fix listviews whose scope Mine has been replaced by Everything\n\n[![Invalid scope:Mine, not allowed ? Deploy your ListViews anyway !](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-invalid-scope-mine.jpg)](https://nicolas.vuillamy.fr/invalid-scope-mine-not-allowed-deploy-your-listviews-anyway-443aceca8ac7)\n\nList of ListViews can be:\n\n- read from .sfdx-hardis.yml file in property **listViewsToSetToMine**\n- sent in argument listviews\n\nNote: property **listViewsToSetToMine** can be auto-generated by command hardis:work:save if .sfdx-hardis.yml contains the following configuration\n\n```yaml\nautoCleanTypes:\n  - listViewsMine\n```\n\n- Example of sfdx-hardis.yml property `listViewsToSetToMine`:\n\n```yaml\nlistViewsToSetToMine:\n  - \"force-app/main/default/objects/Operation__c/listViews/MyCurrentOperations.listView-meta.xml\"\n  - \"force-app/main/default/objects/Operation__c/listViews/MyFinalizedOperations.listView-meta.xml\"\n  - \"force-app/main/default/objects/Opportunity/listViews/Default_Opportunity_Pipeline.listView-meta.xml\"\n  - \"force-app/main/default/objects/Opportunity/listViews/MyCurrentSubscriptions.listView-meta.xml\"\n  - \"force-app/main/default/objects/Opportunity/listViews/MySubscriptions.listView-meta.xml\"\n  - \"force-app/main/default/objects/Account/listViews/MyActivePartners.listView-meta.xml\"\n```\n\n- If manually written, this could also be:\n\n```yaml\nlistViewsToSetToMine:\n  - \"Operation__c:MyCurrentOperations\"\n  - \"Operation__c:MyFinalizedOperations\"\n  - \"Opportunity:Default_Opportunity_Pipeline\"\n  - \"Opportunity:MyCurrentSubscriptions\"\n  - \"Opportunity:MySubscriptions\"\n  - \"Account:MyActivePartners\"\n```\n\nTroubleshooting: if you need to run this command from an alpine-linux based docker image, use this workaround in your dockerfile:\n\n```dockerfile\n# Do not use puppeteer embedded chromium\nRUN apk add --update --no-cache chromium\nENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=\"true\"\nENV CHROMIUM_PATH=\"/usr/bin/chromium-browser\"\nENV PUPPETEER_EXECUTABLE_PATH=\"$\\{CHROMIUM_PATH}\" // remove \\ before {\n```\n",
-      "examples": [
-        "$ sf hardis:org:fix:listviewmine",
-        "$ sf hardis:org:fix:listviewmine --listviews Opportunity:MySubscriptions,Account:MyActivePartners"
-      ],
-      "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"
-        },
-        "listviews": {
-          "char": "l",
-          "description": "Comma-separated list of listviews following format Object:ListViewName\nExample: Contact:MyContacts,Contact:MyActiveContacts,Opportunity:MYClosedOpportunities",
-          "name": "listviews",
-          "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:fix:listviewmine",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Fix listviews with ",
-      "requiresProject": true,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "org",
-        "fix",
-        "listviewmine.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:org:fix:listviewmine",
-        "org:hardis:fix:listviewmine",
-        "org:fix:hardis:listviewmine",
-        "org:fix:listviewmine:hardis",
-        "hardis:fix:org:listviewmine",
-        "fix:hardis:org:listviewmine",
-        "fix:org:hardis:listviewmine",
-        "fix:org:listviewmine:hardis",
-        "hardis:fix:listviewmine:org",
-        "fix:hardis:listviewmine:org",
-        "fix:listviewmine:hardis:org",
-        "fix:listviewmine:org:hardis",
-        "hardis:org:listviewmine:fix",
-        "org:hardis:listviewmine:fix",
-        "org:listviewmine:hardis:fix",
-        "org:listviewmine:fix:hardis",
-        "hardis:listviewmine:org:fix",
-        "listviewmine:hardis:org:fix",
-        "listviewmine:org:hardis:fix",
-        "listviewmine:org:fix:hardis",
-        "hardis:listviewmine:fix:org",
-        "listviewmine:hardis:fix:org",
-        "listviewmine:fix:hardis:org",
-        "listviewmine:fix:org:hardis"
-      ]
-    },
     "hardis:org:generate:packagexmlfull": {
       "aliases": [],
       "args": {},
@@ -11714,262 +11714,47 @@
       "hiddenAliases": [],
       "id": "hardis:project:clean:xml",
       "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Clean retrieved empty items in dx sources",
-      "requiresProject": true,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "project",
-        "clean",
-        "xml.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:project:clean:xml",
-        "project:hardis:clean:xml",
-        "project:clean:hardis:xml",
-        "project:clean:xml:hardis",
-        "hardis:clean:project:xml",
-        "clean:hardis:project:xml",
-        "clean:project:hardis:xml",
-        "clean:project:xml:hardis",
-        "hardis:clean:xml:project",
-        "clean:hardis:xml:project",
-        "clean:xml:hardis:project",
-        "clean:xml:project:hardis",
-        "hardis:project:xml:clean",
-        "project:hardis:xml:clean",
-        "project:xml:hardis:clean",
-        "project:xml:clean:hardis",
-        "hardis:xml:project:clean",
-        "xml:hardis:project:clean",
-        "xml:project:hardis:clean",
-        "xml:project:clean:hardis",
-        "hardis:xml:clean:project",
-        "xml:hardis:clean:project",
-        "xml:clean:hardis:project",
-        "xml:clean:project:hardis"
-      ]
-    },
-    "hardis:project:fix:profiletabs": {
-      "aliases": [],
-      "args": {},
-      "description": "\n## Command Behavior\n\n**Interactively updates tab visibility settings in Salesforce profiles, addressing a common issue where tab visibilities are not correctly retrieved by `sf project retrieve start`.**\n\nThis command provides a user-friendly interface to manage tab settings within your profile XML files, ensuring that your local project accurately reflects the intended tab configurations in your Salesforce org.\n\nKey functionalities:\n\n- **Interactive Tab Selection:** Displays a multi-select menu of all available tabs in your org, allowing you to choose which tabs to update.\n- **Visibility Control:** Lets you set the visibility for the selected tabs to either `DefaultOn` (Visible) or `Hidden`.\n- **Profile Selection:** Presents a multi-select menu of all .profile-meta.xml files in your project, allowing you to apply the tab visibility changes to specific profiles.\n- **XML Updates:** Modifies the <tabVisibilities> section of the selected profile XML files to reflect the chosen tab settings. If a tab visibility setting already exists for a selected tab, it will be updated; otherwise, a new one will be added.\n- **Sorted Output:** The <tabVisibilities> in the updated profile XML files are sorted alphabetically for consistency and readability.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **SOQL Queries (Tooling API):** It queries the `TabDefinition` object using `soqlQueryTooling` to retrieve a list of all available tabs in the target org.\n- **File Discovery:** Uses `glob` to find all .profile-meta.xml files within the specified project path.\n- **Interactive Prompts:** Leverages the `prompts` library to create interactive menus for selecting tabs, visibility settings, and profiles.\n- **XML Parsing and Manipulation:** Uses `parseXmlFile` to read the content of profile XML files and `writeXmlFile` to write the modified content back. It manipulates the `tabVisibilities` array within the parsed XML to add or update tab settings.\n- **Array Sorting:** Employs the `sort-array` library to sort the `tabVisibilities` alphabetically by tab name.\n- **Logging:** Provides feedback to the user about which profiles have been updated and a summary of the changes.\n</details>\n",
-      "examples": [
-        "$ sf hardis:project:fix:profiletabs"
-      ],
-      "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"
-        },
-        "path": {
-          "char": "p",
-          "description": "Root folder",
-          "name": "path",
-          "default": "/home/runner/work/sfdx-hardis/sfdx-hardis",
-          "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:project:fix:profiletabs",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Fix profiles to add tabs that are not retrieved by SF CLI",
-      "requiresProject": true,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "project",
-        "fix",
-        "profiletabs.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:project:fix:profiletabs",
-        "project:hardis:fix:profiletabs",
-        "project:fix:hardis:profiletabs",
-        "project:fix:profiletabs:hardis",
-        "hardis:fix:project:profiletabs",
-        "fix:hardis:project:profiletabs",
-        "fix:project:hardis:profiletabs",
-        "fix:project:profiletabs:hardis",
-        "hardis:fix:profiletabs:project",
-        "fix:hardis:profiletabs:project",
-        "fix:profiletabs:hardis:project",
-        "fix:profiletabs:project:hardis",
-        "hardis:project:profiletabs:fix",
-        "project:hardis:profiletabs:fix",
-        "project:profiletabs:hardis:fix",
-        "project:profiletabs:fix:hardis",
-        "hardis:profiletabs:project:fix",
-        "profiletabs:hardis:project:fix",
-        "profiletabs:project:hardis:fix",
-        "profiletabs:project:fix:hardis",
-        "hardis:profiletabs:fix:project",
-        "profiletabs:hardis:fix:project",
-        "profiletabs:fix:hardis:project",
-        "profiletabs:fix:project:hardis"
-      ]
-    },
-    "hardis:project:fix:v53flexipages": {
-      "aliases": [],
-      "args": {},
-      "description": "\n## Command Behavior\n\n**Fixes Salesforce FlexiPages for compatibility with API Version 53.0 (Winter '22 release) by adding missing identifiers to component instances.**\n\nSalesforce introduced a change in API Version 53.0 that requires `identifier` tags within `componentInstance` and `fieldInstance` elements in FlexiPage metadata. If these identifiers are missing, deployments to orgs with API version 53.0 or higher will fail. This command automates the process of adding these missing identifiers, ensuring your FlexiPages remain deployable.\n\nKey functionalities:\n\n- **Targeted FlexiPage Processing:** Scans all .flexipage-meta.xml files within the specified root folder (defaults to current working directory).\n- **Identifier Injection:** Inserts a unique `identifier` tag (e.g., `SFDX_HARDIS_REPLACEMENT_ID`) into `componentInstance` and `fieldInstance` elements that lack one.\n\n**Important Note:** After running this command, ensure you update your `apiVersion` to `53.0` (or higher) in your `package.xml` and `sfdx-project.json` files.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **File Discovery:** Uses `glob` to find all .flexipage-meta.xml files.\n- **Content Reading:** Reads the XML content of each FlexiPage file.\n- **Regular Expression Replacement:** Employs a set of regular expressions to identify specific XML patterns (componentName.../componentName.../componentInstance, componentName.../componentName.../visibilityRule, fieldItem.../fieldItem.../fieldInstance) that are missing the `identifier` tag.\n- **Dynamic ID Generation:** For each match, it generates a unique identifier (e.g., `sfdxHardisIdX`) and injects it into the XML structure.\n- **File Writing:** If changes are made, the modified XML content is written back to the FlexiPage file using `fs.writeFile`.\n- **Logging:** Provides messages about which FlexiPages are being processed and a summary of the total number of identifiers added.\n</details>\n",
-      "examples": [
-        "$ sf hardis:project:fix:v53flexipages"
-      ],
-      "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"
-        },
-        "path": {
-          "char": "p",
-          "description": "Root folder",
-          "name": "path",
-          "default": "/home/runner/work/sfdx-hardis/sfdx-hardis",
-          "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:project:fix:v53flexipages",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Fix flexipages for v53",
-      "requiresProject": true,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "project",
-        "fix",
-        "v53flexipages.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:project:fix:v53flexipages",
-        "project:hardis:fix:v53flexipages",
-        "project:fix:hardis:v53flexipages",
-        "project:fix:v53flexipages:hardis",
-        "hardis:fix:project:v53flexipages",
-        "fix:hardis:project:v53flexipages",
-        "fix:project:hardis:v53flexipages",
-        "fix:project:v53flexipages:hardis",
-        "hardis:fix:v53flexipages:project",
-        "fix:hardis:v53flexipages:project",
-        "fix:v53flexipages:hardis:project",
-        "fix:v53flexipages:project:hardis",
-        "hardis:project:v53flexipages:fix",
-        "project:hardis:v53flexipages:fix",
-        "project:v53flexipages:hardis:fix",
-        "project:v53flexipages:fix:hardis",
-        "hardis:v53flexipages:project:fix",
-        "v53flexipages:hardis:project:fix",
-        "v53flexipages:project:hardis:fix",
-        "v53flexipages:project:fix:hardis",
-        "hardis:v53flexipages:fix:project",
-        "v53flexipages:hardis:fix:project",
-        "v53flexipages:fix:hardis:project",
-        "v53flexipages:fix:project:hardis"
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Clean retrieved empty items in dx sources",
+      "requiresProject": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "project",
+        "clean",
+        "xml.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:project:clean:xml",
+        "project:hardis:clean:xml",
+        "project:clean:hardis:xml",
+        "project:clean:xml:hardis",
+        "hardis:clean:project:xml",
+        "clean:hardis:project:xml",
+        "clean:project:hardis:xml",
+        "clean:project:xml:hardis",
+        "hardis:clean:xml:project",
+        "clean:hardis:xml:project",
+        "clean:xml:hardis:project",
+        "clean:xml:project:hardis",
+        "hardis:project:xml:clean",
+        "project:hardis:xml:clean",
+        "project:xml:hardis:clean",
+        "project:xml:clean:hardis",
+        "hardis:xml:project:clean",
+        "xml:hardis:project:clean",
+        "xml:project:hardis:clean",
+        "xml:project:clean:hardis",
+        "hardis:xml:clean:project",
+        "xml:hardis:clean:project",
+        "xml:clean:hardis:project",
+        "xml:clean:project:hardis"
       ]
     },
     "hardis:project:deploy:notify": {
@@ -13146,6 +12931,221 @@
         "validate:deploy:project:hardis"
       ]
     },
+    "hardis:project:fix:profiletabs": {
+      "aliases": [],
+      "args": {},
+      "description": "\n## Command Behavior\n\n**Interactively updates tab visibility settings in Salesforce profiles, addressing a common issue where tab visibilities are not correctly retrieved by `sf project retrieve start`.**\n\nThis command provides a user-friendly interface to manage tab settings within your profile XML files, ensuring that your local project accurately reflects the intended tab configurations in your Salesforce org.\n\nKey functionalities:\n\n- **Interactive Tab Selection:** Displays a multi-select menu of all available tabs in your org, allowing you to choose which tabs to update.\n- **Visibility Control:** Lets you set the visibility for the selected tabs to either `DefaultOn` (Visible) or `Hidden`.\n- **Profile Selection:** Presents a multi-select menu of all .profile-meta.xml files in your project, allowing you to apply the tab visibility changes to specific profiles.\n- **XML Updates:** Modifies the <tabVisibilities> section of the selected profile XML files to reflect the chosen tab settings. If a tab visibility setting already exists for a selected tab, it will be updated; otherwise, a new one will be added.\n- **Sorted Output:** The <tabVisibilities> in the updated profile XML files are sorted alphabetically for consistency and readability.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **SOQL Queries (Tooling API):** It queries the `TabDefinition` object using `soqlQueryTooling` to retrieve a list of all available tabs in the target org.\n- **File Discovery:** Uses `glob` to find all .profile-meta.xml files within the specified project path.\n- **Interactive Prompts:** Leverages the `prompts` library to create interactive menus for selecting tabs, visibility settings, and profiles.\n- **XML Parsing and Manipulation:** Uses `parseXmlFile` to read the content of profile XML files and `writeXmlFile` to write the modified content back. It manipulates the `tabVisibilities` array within the parsed XML to add or update tab settings.\n- **Array Sorting:** Employs the `sort-array` library to sort the `tabVisibilities` alphabetically by tab name.\n- **Logging:** Provides feedback to the user about which profiles have been updated and a summary of the changes.\n</details>\n",
+      "examples": [
+        "$ sf hardis:project:fix:profiletabs"
+      ],
+      "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"
+        },
+        "path": {
+          "char": "p",
+          "description": "Root folder",
+          "name": "path",
+          "default": "/home/runner/work/sfdx-hardis/sfdx-hardis",
+          "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:project:fix:profiletabs",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Fix profiles to add tabs that are not retrieved by SF CLI",
+      "requiresProject": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "project",
+        "fix",
+        "profiletabs.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:project:fix:profiletabs",
+        "project:hardis:fix:profiletabs",
+        "project:fix:hardis:profiletabs",
+        "project:fix:profiletabs:hardis",
+        "hardis:fix:project:profiletabs",
+        "fix:hardis:project:profiletabs",
+        "fix:project:hardis:profiletabs",
+        "fix:project:profiletabs:hardis",
+        "hardis:fix:profiletabs:project",
+        "fix:hardis:profiletabs:project",
+        "fix:profiletabs:hardis:project",
+        "fix:profiletabs:project:hardis",
+        "hardis:project:profiletabs:fix",
+        "project:hardis:profiletabs:fix",
+        "project:profiletabs:hardis:fix",
+        "project:profiletabs:fix:hardis",
+        "hardis:profiletabs:project:fix",
+        "profiletabs:hardis:project:fix",
+        "profiletabs:project:hardis:fix",
+        "profiletabs:project:fix:hardis",
+        "hardis:profiletabs:fix:project",
+        "profiletabs:hardis:fix:project",
+        "profiletabs:fix:hardis:project",
+        "profiletabs:fix:project:hardis"
+      ]
+    },
+    "hardis:project:fix:v53flexipages": {
+      "aliases": [],
+      "args": {},
+      "description": "\n## Command Behavior\n\n**Fixes Salesforce FlexiPages for compatibility with API Version 53.0 (Winter '22 release) by adding missing identifiers to component instances.**\n\nSalesforce introduced a change in API Version 53.0 that requires `identifier` tags within `componentInstance` and `fieldInstance` elements in FlexiPage metadata. If these identifiers are missing, deployments to orgs with API version 53.0 or higher will fail. This command automates the process of adding these missing identifiers, ensuring your FlexiPages remain deployable.\n\nKey functionalities:\n\n- **Targeted FlexiPage Processing:** Scans all .flexipage-meta.xml files within the specified root folder (defaults to current working directory).\n- **Identifier Injection:** Inserts a unique `identifier` tag (e.g., `SFDX_HARDIS_REPLACEMENT_ID`) into `componentInstance` and `fieldInstance` elements that lack one.\n\n**Important Note:** After running this command, ensure you update your `apiVersion` to `53.0` (or higher) in your `package.xml` and `sfdx-project.json` files.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **File Discovery:** Uses `glob` to find all .flexipage-meta.xml files.\n- **Content Reading:** Reads the XML content of each FlexiPage file.\n- **Regular Expression Replacement:** Employs a set of regular expressions to identify specific XML patterns (componentName.../componentName.../componentInstance, componentName.../componentName.../visibilityRule, fieldItem.../fieldItem.../fieldInstance) that are missing the `identifier` tag.\n- **Dynamic ID Generation:** For each match, it generates a unique identifier (e.g., `sfdxHardisIdX`) and injects it into the XML structure.\n- **File Writing:** If changes are made, the modified XML content is written back to the FlexiPage file using `fs.writeFile`.\n- **Logging:** Provides messages about which FlexiPages are being processed and a summary of the total number of identifiers added.\n</details>\n",
+      "examples": [
+        "$ sf hardis:project:fix:v53flexipages"
+      ],
+      "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"
+        },
+        "path": {
+          "char": "p",
+          "description": "Root folder",
+          "name": "path",
+          "default": "/home/runner/work/sfdx-hardis/sfdx-hardis",
+          "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:project:fix:v53flexipages",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Fix flexipages for v53",
+      "requiresProject": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "project",
+        "fix",
+        "v53flexipages.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:project:fix:v53flexipages",
+        "project:hardis:fix:v53flexipages",
+        "project:fix:hardis:v53flexipages",
+        "project:fix:v53flexipages:hardis",
+        "hardis:fix:project:v53flexipages",
+        "fix:hardis:project:v53flexipages",
+        "fix:project:hardis:v53flexipages",
+        "fix:project:v53flexipages:hardis",
+        "hardis:fix:v53flexipages:project",
+        "fix:hardis:v53flexipages:project",
+        "fix:v53flexipages:hardis:project",
+        "fix:v53flexipages:project:hardis",
+        "hardis:project:v53flexipages:fix",
+        "project:hardis:v53flexipages:fix",
+        "project:v53flexipages:hardis:fix",
+        "project:v53flexipages:fix:hardis",
+        "hardis:v53flexipages:project:fix",
+        "v53flexipages:hardis:project:fix",
+        "v53flexipages:project:hardis:fix",
+        "v53flexipages:project:fix:hardis",
+        "hardis:v53flexipages:fix:project",
+        "v53flexipages:hardis:fix:project",
+        "v53flexipages:fix:hardis:project",
+        "v53flexipages:fix:project:hardis"
+      ]
+    },
     "hardis:project:generate:bypass": {
       "aliases": [],
       "args": {},
@@ -15719,5 +15719,5 @@
       ]
     }
   },
-  "version": "6.15.1-beta202512081818.0"
+  "version": "6.15.2-beta202512140349.0"
 }