sfdx-hardis 6.15.2-beta202512140349.0 → 6.16.0

package/oclif.manifest.json

@@ -57,12 +57,13 @@
         "world:hello"
       ]
     },
-    "hardis:cache:clear": {
+    "hardis:auth:login": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Clears the local cache generated by the sfdx-hardis plugin.**\n\nThis command is designed to remove temporary files, stored configurations, and other cached data that sfdx-hardis uses to optimize its operations. Clearing the cache can be beneficial for:\n\n- **Troubleshooting:** Resolving unexpected behavior or inconsistencies.\n- **Disk Space Management:** Freeing up storage on your local machine.\n- **Ensuring Fresh Data:** Guaranteeing that the plugin operates with the most current data and configurations.\n\n## Technical explanations\n\nThe command's technical implementation is straightforward:\n\n- **Direct Function Call:** It directly invokes the `clearCache()` function, which is imported from \buri../../../common/cache/index.js\buri.\n- **Cache Management Logic:** The \buriclearCache()` function encapsulates the logic for identifying and removing the specific files and directories that constitute the sfdx-hardis cache.\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:cache:clear"
+        "$ sf hardis:auth:login",
+        "CI=true CI_COMMIT_REF_NAME=monitoring_myclient sf hardis:auth:login"
       ],
       "flags": {
         "json": {
@@ -80,6 +81,28 @@
           "multiple": false,
           "type": "option"
         },
+        "instanceurl": {
+          "char": "r",
+          "description": "URL of org instance",
+          "name": "instanceurl",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "devhub": {
+          "char": "h",
+          "description": "Also connect associated DevHub",
+          "name": "devhub",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "scratchorg": {
+          "char": "s",
+          "description": "Scratch org",
+          "name": "scratchorg",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -103,42 +126,38 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:cache:clear",
+      "id": "hardis:auth:login",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Clear sfdx-hardis cache",
-      "uiConfig": {
-        "hide": true
-      },
+      "title": "Login",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "cache",
-        "clear.js"
+        "auth",
+        "login.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:cache:clear",
-        "cache:hardis:clear",
-        "cache:clear:hardis",
-        "hardis:clear:cache",
-        "clear:hardis:cache",
-        "clear:cache:hardis"
+        "hardis:auth:login",
+        "auth:hardis:login",
+        "auth:login:hardis",
+        "hardis:login:auth",
+        "login:hardis:auth",
+        "login:auth:hardis"
       ]
     },
-    "hardis:auth:login": {
+    "hardis:cache:clear": {
       "aliases": [],
       "args": {},
-      "description": "\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**Clears the local cache generated by the sfdx-hardis plugin.**\n\nThis command is designed to remove temporary files, stored configurations, and other cached data that sfdx-hardis uses to optimize its operations. Clearing the cache can be beneficial for:\n\n- **Troubleshooting:** Resolving unexpected behavior or inconsistencies.\n- **Disk Space Management:** Freeing up storage on your local machine.\n- **Ensuring Fresh Data:** Guaranteeing that the plugin operates with the most current data and configurations.\n\n## Technical explanations\n\nThe command's technical implementation is straightforward:\n\n- **Direct Function Call:** It directly invokes the `clearCache()` function, which is imported from \buri../../../common/cache/index.js\buri.\n- **Cache Management Logic:** The \buriclearCache()` function encapsulates the logic for identifying and removing the specific files and directories that constitute the sfdx-hardis cache.\n",
       "examples": [
-        "$ sf hardis:auth:login",
-        "CI=true CI_COMMIT_REF_NAME=monitoring_myclient sf hardis:auth:login"
+        "$ sf hardis:cache:clear"
       ],
       "flags": {
         "json": {
@@ -156,28 +175,6 @@
           "multiple": false,
           "type": "option"
         },
-        "instanceurl": {
-          "char": "r",
-          "description": "URL of org instance",
-          "name": "instanceurl",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "devhub": {
-          "char": "h",
-          "description": "Also connect associated DevHub",
-          "name": "devhub",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "scratchorg": {
-          "char": "s",
-          "description": "Scratch org",
-          "name": "scratchorg",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -201,30 +198,33 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "hardis:auth:login",
+      "id": "hardis:cache:clear",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Login",
+      "title": "Clear sfdx-hardis cache",
+      "uiConfig": {
+        "hide": true
+      },
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "auth",
-        "login.js"
+        "cache",
+        "clear.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:auth:login",
-        "auth:hardis:login",
-        "auth:login:hardis",
-        "hardis:login:auth",
-        "login:hardis:auth",
-        "login:auth:hardis"
+        "hardis:cache:clear",
+        "cache:hardis:clear",
+        "cache:clear:hardis",
+        "hardis:clear:cache",
+        "clear:hardis:cache",
+        "clear:cache:hardis"
       ]
     },
     "hardis:config:get": {
@@ -3035,12 +3035,12 @@
         "lint:project:hardis"
       ]
     },
-    "hardis:scratch:create": {
+    "hardis:source:deploy": {
       "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",
+      "description": "sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.\n\nAdditional to the base command wrapper: If using **--checkonly**, add options **--checkcoverage** and **--coverageformatters json-summary** to check that org coverage is > 75% (or value defined in .sfdx-hardis.yml property **apexTestsMinCoverageOrgWide**)\n\n### Deployment results\n\nYou can also have deployment results as pull request comments, on:\n\n- GitHub (see [GitHub Pull Requests comments config](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-github/))\n- Gitlab (see [Gitlab integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-gitlab/))\n- Azure DevOps (see [Azure integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-azure/))\n\n\n[![Assisted solving of Salesforce deployments errors](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deployment-errors.jpg)](https://nicolas.vuillamy.fr/assisted-solving-of-salesforce-deployments-errors-47f3666a9ed0)\n\n### Deployment pre or post commands\n\nYou can define command lines to run before or after a deployment, with parameters:\n\n- **id**: Unique Id for the command\n- **label**: Human readable label for the command\n- **skipIfError**: If defined to \"true\", the post-command won't be run if there is a deployment failure\n- **context**: Defines the context where the command will be run. Can be **all** (default), **check-deployment-only** or **process-deployment-only**\n- **runOnlyOnceByOrg**: If set to true, the command will be run only one time per org. A record of SfdxHardisTrace__c is stored to make that possible (it needs to be existing in target org)\n\nIf the commands are not the same depending on the target org, you can define them into **config/branches/.sfdx-hardis-BRANCHNAME.yml** instead of root **config/.sfdx-hardis.yml**\n\nExample:\n\n```yaml\ncommandsPreDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to the deployment user\n    command: sf data update record --sobject User --where \"Username='deploy.github@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n\ncommandsPostDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to desired username\n    command: sf data update record --sobject User --where \"Username='admin-yser@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n  - id: someActionToRunJustOneTime\n    label: And to run only if deployment is success\n    command: sf sfdmu:run ...\n    skipIfError: true\n    context: process-deployment-only\n    runOnlyOnceByOrg: true\n```\n\nNotes:\n\n- You can disable coloring of errors in red by defining env variable SFDX_HARDIS_DEPLOY_ERR_COLORS=false\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy)\n",
       "examples": [
-        "$ sf hardis:scratch:create"
+        "$ sf hardis:source:deploy -x manifest/package.xml --wait 60 --ignorewarnings --testlevel RunLocalTests --postdestructivechanges ./manifest/destructiveChanges.xml --target-org nicolas.vuillamy@cloudity.com.sfdxhardis --checkonly --checkcoverage --verbose --coverageformatters json-summary"
       ],
       "flags": {
         "json": {
@@ -3058,213 +3058,205 @@
           "multiple": false,
           "type": "option"
         },
-        "forcenew": {
-          "char": "n",
-          "description": "If an existing scratch org exists, do not reuse it but create a new one",
-          "name": "forcenew",
+        "checkonly": {
+          "char": "c",
+          "description": "checkonly",
+          "name": "checkonly",
           "allowNo": false,
           "type": "boolean"
         },
-        "pool": {
-          "description": "Creates the scratch org for a scratch org pool",
-          "name": "pool",
+        "soapdeploy": {
+          "description": "soapDeploy",
+          "name": "soapdeploy",
           "allowNo": false,
           "type": "boolean"
         },
-        "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
+        "wait": {
+          "char": "w",
+          "description": "wait",
+          "name": "wait",
+          "default": 60,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
-          "name": "websocket",
+        "testlevel": {
+          "char": "l",
+          "description": "testlevel",
+          "name": "testlevel",
+          "default": "NoTestRun",
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "NoTestRun",
+            "RunSpecifiedTests",
+            "RunLocalTests",
+            "RunAllTestsInOrg"
+          ],
           "type": "option"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
+        "runtests": {
+          "char": "r",
+          "description": "runTests",
+          "name": "runtests",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "ignoreerrors": {
+          "description": "ignoreErrors",
+          "name": "ignoreerrors",
           "allowNo": false,
           "type": "boolean"
         },
-        "target-dev-hub": {
-          "aliases": [
-            "targetdevhubusername"
-          ],
-          "char": "v",
-          "deprecateAliases": true,
-          "name": "target-dev-hub",
-          "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the Dev Hub org. Not required if the `target-dev-hub` configuration variable is already set.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": true,
-      "hiddenAliases": [],
-      "id": "hardis:scratch:create",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Create and initialize scratch org",
-      "requiresProject": true,
-      "requiresSfdxPlugins": [
-        "sfdmu"
-      ],
-      "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",
+        "ignorewarnings": {
+          "char": "g",
+          "description": "ignoreWarnings",
+          "name": "ignorewarnings",
           "allowNo": false,
           "type": "boolean"
         },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
+        "validateddeployrequestid": {
+          "char": "q",
+          "description": "validateDeployRequestId",
+          "exclusive": [
+            "manifest",
+            "metadata",
+            "sourcepath",
+            "checkonly",
+            "testlevel",
+            "runtests",
+            "ignoreerrors",
+            "ignorewarnings"
+          ],
+          "name": "validateddeployrequestid",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
-          "name": "debug",
+        "verbose": {
+          "description": "verbose",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
         },
-        "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
-          "name": "websocket",
+        "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"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
-          "allowNo": false,
-          "type": "boolean"
+        "predestructivechanges": {
+          "dependsOn": [
+            "manifest"
+          ],
+          "description": "predestructivechanges",
+          "name": "predestructivechanges",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "target-dev-hub": {
-          "aliases": [
-            "targetdevhubusername"
+        "postdestructivechanges": {
+          "dependsOn": [
+            "manifest"
           ],
-          "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,
+          "description": "postdestructivechanges",
+          "name": "postdestructivechanges",
+          "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        }
-      },
-      "hasDynamicHelp": true,
-      "hiddenAliases": [],
-      "id": "hardis:scratch:delete",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Delete scratch orgs(s)",
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "scratch",
-        "delete.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:scratch:delete",
-        "scratch:hardis:delete",
-        "scratch:delete:hardis",
-        "hardis:delete:scratch",
-        "delete:hardis:scratch",
-        "delete:scratch:hardis"
-      ]
-    },
-    "hardis:scratch:pull": {
-      "aliases": [],
-      "args": {},
-      "description": "\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",
+        },
+        "tracksource": {
+          "char": "t",
+          "description": "tracksource",
+          "exclusive": [
+            "checkonly",
+            "validateddeployrequestid"
+          ],
+          "name": "tracksource",
           "allowNo": false,
           "type": "boolean"
         },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
+        "forceoverwrite": {
+          "char": "f",
+          "dependsOn": [
+            "tracksource"
+          ],
+          "description": "forceoverwrite",
+          "name": "forceoverwrite",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "resultsdir": {
+          "description": "resultsdir",
+          "name": "resultsdir",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "coverageformatters": {
+          "description": "coverageformatters",
+          "name": "coverageformatters",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "junit": {
+          "description": "junit",
+          "name": "junit",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "checkcoverage": {
+          "description": "Check Apex org coverage",
+          "name": "checkcoverage",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
+          "description": "debug",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
         "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
+          "description": "websocket",
           "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "target-org": {
           "aliases": [
             "targetusername",
@@ -3283,39 +3275,35 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:scratch:pull",
+      "id": "hardis:source:deploy",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Scratch PULL",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "scratch",
-        "pull.js"
+        "source",
+        "deploy.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:scratch:pull",
-        "scratch:hardis:pull",
-        "scratch:pull:hardis",
-        "hardis:pull:scratch",
-        "pull:hardis:scratch",
-        "pull:scratch:hardis"
+        "hardis:source:deploy",
+        "source:hardis:deploy",
+        "source:deploy:hardis",
+        "hardis:deploy:source",
+        "deploy:hardis:source",
+        "deploy:source:hardis"
       ]
     },
-    "hardis:scratch:push": {
+    "hardis:source:push": {
       "aliases": [],
       "args": {},
-      "description": "## 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": "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.",
@@ -3332,26 +3320,48 @@
           "multiple": false,
           "type": "option"
         },
+        "forceoverwrite": {
+          "char": "f",
+          "description": "forceoverwrite",
+          "name": "forceoverwrite",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "wait": {
+          "char": "w",
+          "description": "wait",
+          "name": "wait",
+          "default": 60,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "ignorewarnings": {
+          "char": "g",
+          "description": "ignorewarnings",
+          "name": "ignorewarnings",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "quiet": {
+          "description": "quiet",
+          "name": "quiet",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
-          "char": "d",
-          "description": "Activate debug mode (more logs)",
+          "description": "debug",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
         "websocket": {
-          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
+          "description": "websocket",
           "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "skipauth": {
-          "description": "Skip authentication check when a default username is required",
-          "name": "skipauth",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "target-org": {
           "aliases": [
             "targetusername",
@@ -3370,39 +3380,36 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:scratch:push",
+      "id": "hardis:source:push",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Scratch PUSH",
       "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "scratch",
+        "source",
         "push.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:scratch:push",
-        "scratch:hardis:push",
-        "scratch:push:hardis",
-        "hardis:push:scratch",
-        "push:hardis:scratch",
-        "push:scratch:hardis"
+        "hardis:source:push",
+        "source:hardis:push",
+        "source:push:hardis",
+        "hardis:push:source",
+        "push:hardis:source",
+        "push:source:hardis"
       ]
     },
-    "hardis:source:deploy": {
+    "hardis:source:retrieve": {
       "aliases": [],
       "args": {},
-      "description": "sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.\n\nAdditional to the base command wrapper: If using **--checkonly**, add options **--checkcoverage** and **--coverageformatters json-summary** to check that org coverage is > 75% (or value defined in .sfdx-hardis.yml property **apexTestsMinCoverageOrgWide**)\n\n### Deployment results\n\nYou can also have deployment results as pull request comments, on:\n\n- GitHub (see [GitHub Pull Requests comments config](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-github/))\n- Gitlab (see [Gitlab integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-gitlab/))\n- Azure DevOps (see [Azure integration configuration](https://sfdx-hardis.cloudity.com/salesforce-ci-cd-setup-integration-azure/))\n\n\n[![Assisted solving of Salesforce deployments errors](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deployment-errors.jpg)](https://nicolas.vuillamy.fr/assisted-solving-of-salesforce-deployments-errors-47f3666a9ed0)\n\n### Deployment pre or post commands\n\nYou can define command lines to run before or after a deployment, with parameters:\n\n- **id**: Unique Id for the command\n- **label**: Human readable label for the command\n- **skipIfError**: If defined to \"true\", the post-command won't be run if there is a deployment failure\n- **context**: Defines the context where the command will be run. Can be **all** (default), **check-deployment-only** or **process-deployment-only**\n- **runOnlyOnceByOrg**: If set to true, the command will be run only one time per org. A record of SfdxHardisTrace__c is stored to make that possible (it needs to be existing in target org)\n\nIf the commands are not the same depending on the target org, you can define them into **config/branches/.sfdx-hardis-BRANCHNAME.yml** instead of root **config/.sfdx-hardis.yml**\n\nExample:\n\n```yaml\ncommandsPreDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to the deployment user\n    command: sf data update record --sobject User --where \"Username='deploy.github@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n\ncommandsPostDeploy:\n  - id: knowledgeUnassign\n    label: Remove KnowledgeUser right to the user who has it\n    command: sf data update record --sobject User --where \"UserPermissionsKnowledgeUser='true'\" --values \"UserPermissionsKnowledgeUser='false'\" --json\n  - id: knowledgeAssign\n    label: Assign Knowledge user to desired username\n    command: sf data update record --sobject User --where \"Username='admin-yser@myclient.com'\" --values \"UserPermissionsKnowledgeUser='true'\" --json\n  - id: someActionToRunJustOneTime\n    label: And to run only if deployment is success\n    command: sf sfdmu:run ...\n    skipIfError: true\n    context: process-deployment-only\n    runOnlyOnceByOrg: true\n```\n\nNotes:\n\n- You can disable coloring of errors in red by defining env variable SFDX_HARDIS_DEPLOY_ERR_COLORS=false\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy)\n",
-      "examples": [
-        "$ sf hardis:source:deploy -x manifest/package.xml --wait 60 --ignorewarnings --testlevel RunLocalTests --postdestructivechanges ./manifest/destructiveChanges.xml --target-org nicolas.vuillamy@cloudity.com.sfdxhardis --checkonly --checkcoverage --verbose --coverageformatters json-summary"
-      ],
+      "description": "\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.",
@@ -3419,89 +3426,46 @@
           "multiple": false,
           "type": "option"
         },
-        "checkonly": {
-          "char": "c",
-          "description": "checkonly",
-          "name": "checkonly",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "soapdeploy": {
-          "description": "soapDeploy",
-          "name": "soapdeploy",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "wait": {
-          "char": "w",
-          "description": "wait",
-          "name": "wait",
-          "default": 60,
+        "apiversion": {
+          "char": "a",
+          "description": "Override the api version used for api requests made by this command",
+          "name": "apiversion",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "testlevel": {
-          "char": "l",
-          "description": "testlevel",
-          "name": "testlevel",
-          "default": "NoTestRun",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "NoTestRun",
-            "RunSpecifiedTests",
-            "RunLocalTests",
-            "RunAllTestsInOrg"
+        "sourcepath": {
+          "char": "p",
+          "description": "sourcePath",
+          "exclusive": [
+            "manifest",
+            "metadata"
           ],
-          "type": "option"
-        },
-        "runtests": {
-          "char": "r",
-          "description": "runTests",
-          "name": "runtests",
-          "default": [],
+          "name": "sourcepath",
           "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"
+        "wait": {
+          "char": "w",
+          "description": "wait",
+          "name": "wait",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "validateddeployrequestid": {
-          "char": "q",
-          "description": "validateDeployRequestId",
+        "manifest": {
+          "char": "x",
+          "description": "manifest",
           "exclusive": [
-            "manifest",
             "metadata",
-            "sourcepath",
-            "checkonly",
-            "testlevel",
-            "runtests",
-            "ignoreerrors",
-            "ignorewarnings"
+            "sourcepath"
           ],
-          "name": "validateddeployrequestid",
+          "name": "manifest",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "verbose": {
-          "description": "verbose",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "metadata": {
           "char": "m",
           "description": "metadata",
@@ -3514,121 +3478,255 @@
           "multiple": true,
           "type": "option"
         },
-        "sourcepath": {
-          "char": "p",
-          "description": "sourcePath",
-          "exclusive": [
-            "manifest",
-            "metadata"
-          ],
-          "name": "sourcepath",
+        "packagenames": {
+          "char": "n",
+          "description": "packagenames",
+          "name": "packagenames",
           "hasDynamicHelp": false,
           "multiple": true,
           "type": "option"
         },
-        "manifest": {
-          "char": "x",
-          "description": "flagsLong.manifest",
-          "exclusive": [
-            "metadata",
-            "sourcepath"
+        "tracksource": {
+          "char": "t",
+          "description": "tracksource",
+          "name": "tracksource",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "forceoverwrite": {
+          "char": "f",
+          "dependsOn": [
+            "tracksource"
           ],
-          "name": "manifest",
+          "description": "forceoverwrite",
+          "name": "forceoverwrite",
+          "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",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "predestructivechanges": {
-          "dependsOn": [
-            "manifest"
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
           ],
-          "description": "predestructivechanges",
-          "name": "predestructivechanges",
+          "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.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "postdestructivechanges": {
-          "dependsOn": [
-            "manifest"
-          ],
-          "description": "postdestructivechanges",
-          "name": "postdestructivechanges",
+        "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"
+        },
+        "pool": {
+          "description": "Creates the scratch org for a scratch org pool",
+          "name": "pool",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "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"
         },
-        "tracksource": {
-          "char": "t",
-          "description": "tracksource",
-          "exclusive": [
-            "checkonly",
-            "validateddeployrequestid"
-          ],
-          "name": "tracksource",
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
           "allowNo": false,
           "type": "boolean"
         },
-        "forceoverwrite": {
-          "char": "f",
-          "dependsOn": [
-            "tracksource"
+        "target-dev-hub": {
+          "aliases": [
+            "targetdevhubusername"
           ],
-          "description": "forceoverwrite",
-          "name": "forceoverwrite",
+          "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"
         },
-        "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"
         },
-        "target-org": {
+        "skipauth": {
+          "description": "Skip authentication check when a default username is required",
+          "name": "skipauth",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "target-dev-hub": {
           "aliases": [
-            "targetusername",
-            "u"
+            "targetdevhubusername"
           ],
-          "char": "o",
+          "char": "v",
           "deprecateAliases": true,
-          "name": "target-org",
+          "name": "target-dev-hub",
           "noCacheDefault": true,
           "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+          "summary": "Username or alias of the Dev Hub org. Not required if the `target-dev-hub` configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
@@ -3636,35 +3734,38 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:deploy",
+      "id": "hardis:scratch:delete",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "requiresProject": true,
+      "title": "Delete scratch orgs(s)",
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
-        "source",
-        "deploy.js"
+        "scratch",
+        "delete.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:deploy",
-        "source:hardis:deploy",
-        "source:deploy:hardis",
-        "hardis:deploy:source",
-        "deploy:hardis:source",
-        "deploy:source:hardis"
+        "hardis:scratch:delete",
+        "scratch:hardis:delete",
+        "scratch:delete:hardis",
+        "hardis:delete:scratch",
+        "delete:hardis:scratch",
+        "delete:scratch:hardis"
       ]
     },
-    "hardis:source:push": {
+    "hardis:scratch:pull": {
       "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": "\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.",
@@ -3681,48 +3782,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",
@@ -3741,36 +3820,39 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:push",
+      "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",
-        "push.js"
+        "scratch",
+        "pull.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:push",
-        "source:hardis:push",
-        "source:push:hardis",
-        "hardis:push:source",
-        "push:hardis:source",
-        "push:source:hardis"
+        "hardis:scratch:pull",
+        "scratch:hardis:pull",
+        "scratch:pull:hardis",
+        "hardis:pull:scratch",
+        "pull:hardis:scratch",
+        "pull:scratch:hardis"
       ]
     },
-    "hardis:source:retrieve": {
+    "hardis:scratch:push": {
       "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": "## 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.",
@@ -3787,98 +3869,15 @@
           "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": "debugMode",
+          "description": "Activate debug mode (more logs)",
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
         },
         "websocket": {
-          "description": "websocket",
+          "description": "Websocket host:port for VsCode SFDX Hardis UI integration",
           "name": "websocket",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -3908,29 +3907,30 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:source:retrieve",
+      "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",
-        "retrieve.js"
+        "scratch",
+        "push.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:source:retrieve",
-        "source:hardis:retrieve",
-        "source:retrieve:hardis",
-        "hardis:retrieve:source",
-        "retrieve:hardis:source",
-        "retrieve:source:hardis"
+        "hardis:scratch:push",
+        "scratch:hardis:push",
+        "scratch:push:hardis",
+        "hardis:push:scratch",
+        "push:hardis:scratch",
+        "push:scratch:hardis"
       ]
     },
     "hardis:work:new": {
@@ -5539,12 +5539,15 @@
         "import:data:org:hardis"
       ]
     },
-    "hardis:org:files:export": {
+    "hardis:org:diagnose:audittrail": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Exports file attachments (ContentVersion, Attachment) from a Salesforce org based on a predefined configuration.**\n\nThis command enables the mass download of files associated with Salesforce records, providing a robust solution for backing up files, migrating them to other systems, or integrating them with external document management solutions.\n\nKey functionalities:\n\n- **Configuration-Driven Export:** Relies on an `export.json` file within a designated file export project to define the export criteria, including the SOQL query for parent records, file types to export, output naming conventions, and file size filtering.\n- **File Size Filtering:** Supports minimum file size filtering via the `fileSizeMin` configuration parameter (in KB). Files smaller than the specified size will be skipped during export.\n- **File Validation:** After downloading each file, validates the integrity by:\n  - **Checksum Validation:** For ContentVersion files, compares MD5 checksum with Salesforce's stored checksum\n  - **Size Validation:** For both ContentVersion and Attachment files, verifies actual file size matches expected size\n  - **Status Tracking:** Files are categorized with specific statuses: `success` (valid files), `failed` (download errors), `skipped` (filtered files), `invalid` (downloaded but failed validation)\n  - All validation results are logged in the CSV export log for audit purposes\n- **Resume/Restart Capability:** \n  - **Resume Mode:** When `--resume` flag is used (default in CI environments), checks existing downloaded files for validity. Valid files are skipped, invalid files are re-downloaded.\n  - **Restart Mode:** When resume is disabled, clears the output folder and starts a fresh export.\n  - **Interactive Mode:** When existing files are found and `--resume` is not explicitly specified (non-CI environments), prompts the user to choose between resume or restart.\n- **Interactive Project Selection:** If the file export project path is not provided via the `--path` flag, it interactively prompts the user to select one.\n- **Configurable Export Options:** Allows overriding default export settings such as `chunksize` (number of records processed in a batch), `polltimeout` (timeout for Bulk API calls), and `startchunknumber` (to resume a failed export).\n- **Support for ContentVersion and Attachment:** Handles both modern Salesforce Files (ContentVersion) and older Attachments.\n\nSee this article for a practical example:\n\n[![How to mass download notes and attachments files from a Salesforce org](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-mass-download.jpg)](https://nicolas.vuillamy.fr/how-to-mass-download-notes-and-attachments-files-from-a-salesforce-org-83a028824afd)\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **FilesExporter Class:** The core logic is encapsulated within the `FilesExporter` class, which orchestrates the entire export process.\n- **SOQL Queries (Bulk API):** It uses Salesforce Bulk API queries to efficiently retrieve large volumes of parent record IDs and file metadata, including checksums and file sizes.\n- **File Download:** Downloads the actual file content from Salesforce.\n- **File Validation:** After each successful download, validates file integrity by comparing checksums (ContentVersion) and file sizes (both ContentVersion and Attachment) against Salesforce metadata.\n- **Resume Logic:** In resume mode, checks for existing files before downloading, validates their integrity, and only re-downloads invalid or missing files. This enables efficient recovery from interrupted exports.\n- **File System Operations:** Writes the downloaded files to the local file system, organizing them into folders based on the configured naming conventions.\n- **Configuration Loading:** Reads the `export.json` file to get the export configuration. It also allows for interactive overriding of these settings.\n- **Interactive Prompts:** Uses `selectFilesWorkspace` to allow the user to choose a file export project, `promptFilesExportConfiguration` for customizing export options, and prompts for resume/restart choice when existing files are found.\n- **Error Handling:** Includes mechanisms to handle potential errors during the export process, such as network issues, API limits, and file validation failures. Each file is assigned a specific status (`success`, `failed`, `skipped`, `invalid`) for comprehensive tracking and troubleshooting.\n</details>\n",
+      "description": "Export Audit trail into a CSV file with selected criteria, and highlight suspect actions\n\nAlso detects updates of Custom Settings values (disable by defining `SKIP_AUDIT_TRAIL_CUSTOM_SETTINGS=true`)\n\nRegular setup actions performed in major orgs are filtered.\n\n- \"\"\n  - createScratchOrg\n  - changedsenderemail\n  - deleteScratchOrg\n  - loginasgrantedtopartnerbt\n- Certificate and Key Management\n  - insertCertificate\n- Custom App Licenses\n  - addeduserpackagelicense\n  - granteduserpackagelicense\n  - revokeduserpackagelicense\n- Customer Portal\n  - createdcustomersuccessuser\n  - CSPUserDisabled\n- Currency\n  - updateddatedexchrate\n- Data Management\n  - queueMembership\n- Email Administration\n  - dkimRotationPreparationSuccessful\n  - dkimRotationSuccessful\n- External Objects\n  - xdsEncryptedFieldChange\n- Groups\n  - groupMembership\n- Holidays\n  - holiday_insert\n- Inbox mobile and legacy desktop apps\n  - enableSIQUserNonEAC\n  - siqUserAcceptedTOS\n- Manage Users\n  - activateduser\n  - createduser\n  - changedcommunitynickname\n  - changedemail\n  - changedfederationid\n  - changedpassword\n  - changedinteractionuseroffon\n  - changedinteractionuseronoff\n  - changedmarketinguseroffon\n  - changedmarketinguseronoff\n  - changedofflineuseroffon\n  - changedprofileforuserstdtostd\n  - changedprofileforuser\n  - changedprofileforusercusttostd\n  - changedprofileforuserstdtocust\n  - changedroleforusertonone\n  - changedroleforuser\n  - changedroleforuserfromnone\n  - changedUserAdminVerifiedStatusVerified\n  - changedUserEmailVerifiedStatusUnverified\n  - changedUserEmailVerifiedStatusVerified\n  - changedknowledgeuseroffon\n  - changedsfcontentuseroffon\n  - changedsupportuseroffon\n  - changedusername\n  - changedUserPhoneNumber\n  - changedUserPhoneVerifiedStatusUnverified\n  - changedUserPhoneVerifiedStatusVerified\n  - deactivateduser\n  - deleteAuthenticatorPairing\n  - deleteTwoFactorInfo2\n  - deleteTwoFactorTempCode\n  - frozeuser\n  - insertAuthenticatorPairing\n  - insertTwoFactorInfo2\n  - insertTwoFactorTempCode\n  - lightningloginenroll\n  - PermSetAssign\n  - PermSetGroupAssign\n  - PermSetGroupUnassign\n  - PermSetLicenseAssign\n  - PermSetUnassign\n  - PermSetLicenseUnassign\n  - registeredUserPhoneNumber\n  - resetpassword\n  - suNetworkAdminLogin\n  - suNetworkAdminLogout\n  - suOrgAdminLogin\n  - suOrgAdminLogout\n  - unfrozeuser\n  - useremailchangesent\n- Mobile Administration\n  - assigneduserstomobileconfig\n- Reporting Snapshots\n  - createdReportJob\n  - deletedReportJob\n- Sandboxes\n  - DeleteSandbox\n\nBy default, deployment user defined in .sfdx-hardis.yml targetUsername property will be excluded.\n\nYou can define additional users to exclude in .sfdx-hardis.yml **monitoringExcludeUsernames** property.\n\nYou can also add more sections / actions considered as not suspect using property **monitoringAllowedSectionsActions**\n\nExample:\n\n```yaml\nmonitoringExcludeUsernames:\n  - deploymentuser@cloudity.com\n  - marketingcloud@cloudity.com\n  - integration-user@cloudity.com\n\nmonitoringAllowedSectionsActions:\n  \"Some section\": [] // Will ignore all actions from such section\n  \"Some other section\": [\"actionType1\",\"actionType2\",\"actionType3\"] // Will ignore only those 3 actions from section \"Some other section\". Other actions in the same section will be considered as suspect.\n```\n\n## Excel output example\n\n![](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/screenshot-monitoring-audittrail-excel.jpg)\n\n## Local output example\n\n![](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/screenshot-monitoring-audittrail-local.jpg)\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-suspect-audit-trail/) and can output Grafana, Slack and MsTeams Notifications.\n",
       "examples": [
-        "$ sf hardis:org:files:export"
+        "$ sf hardis:org:diagnose:audittrail",
+        "$ sf hardis:org:diagnose:audittrail --excludeusers baptiste@titi.com",
+        "$ sf hardis:org:diagnose:audittrail --excludeusers baptiste@titi.com,bertrand@titi.com",
+        "$ sf hardis:org:diagnose:audittrail --lastndays 5"
       ],
       "flags": {
         "json": {
@@ -5562,48 +5565,30 @@
           "multiple": false,
           "type": "option"
         },
-        "path": {
-          "char": "p",
-          "description": "Path to the file export project",
-          "name": "path",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "chunksize": {
-          "char": "c",
-          "description": "Number of records to add in a chunk before it is processed",
-          "name": "chunksize",
-          "default": 1000,
+        "excludeusers": {
+          "char": "e",
+          "description": "Comma-separated list of usernames to exclude",
+          "name": "excludeusers",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "polltimeout": {
+        "lastndays": {
           "char": "t",
-          "description": "Timeout in MS for Bulk API calls",
-          "name": "polltimeout",
-          "default": 300000,
+          "description": "Number of days to extract from today (included)",
+          "name": "lastndays",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "startchunknumber": {
-          "char": "s",
-          "description": "Chunk number to start from",
-          "name": "startchunknumber",
-          "default": 0,
+        "outputfile": {
+          "char": "f",
+          "description": "Force the path and name of output report file. Must end with .csv",
+          "name": "outputfile",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "resume": {
-          "char": "r",
-          "description": "Resume previous export by checking existing files (default in CI)",
-          "name": "resume",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -5642,13 +5627,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:files:export",
+      "id": "hardis:org:diagnose:audittrail",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Export files",
+      "title": "Diagnose content of Setup Audit Trail",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -5656,43 +5641,43 @@
         "commands",
         "hardis",
         "org",
-        "files",
-        "export.js"
+        "diagnose",
+        "audittrail.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:files:export",
-        "org:hardis:files:export",
-        "org:files:hardis:export",
-        "org:files:export:hardis",
-        "hardis:files:org:export",
-        "files:hardis:org:export",
-        "files:org:hardis:export",
-        "files:org:export:hardis",
-        "hardis:files:export:org",
-        "files:hardis:export:org",
-        "files:export:hardis:org",
-        "files:export:org:hardis",
-        "hardis:org:export:files",
-        "org:hardis:export:files",
-        "org:export:hardis:files",
-        "org:export:files:hardis",
-        "hardis:export:org:files",
-        "export:hardis:org:files",
-        "export:org:hardis:files",
-        "export:org:files:hardis",
-        "hardis:export:files:org",
-        "export:hardis:files:org",
-        "export:files:hardis:org",
-        "export:files:org:hardis"
+        "hardis:org:diagnose:audittrail",
+        "org:hardis:diagnose:audittrail",
+        "org:diagnose:hardis:audittrail",
+        "org:diagnose:audittrail:hardis",
+        "hardis:diagnose:org:audittrail",
+        "diagnose:hardis:org:audittrail",
+        "diagnose:org:hardis:audittrail",
+        "diagnose:org:audittrail:hardis",
+        "hardis:diagnose:audittrail:org",
+        "diagnose:hardis:audittrail:org",
+        "diagnose:audittrail:hardis:org",
+        "diagnose:audittrail:org:hardis",
+        "hardis:org:audittrail:diagnose",
+        "org:hardis:audittrail:diagnose",
+        "org:audittrail:hardis:diagnose",
+        "org:audittrail:diagnose:hardis",
+        "hardis:audittrail:org:diagnose",
+        "audittrail:hardis:org:diagnose",
+        "audittrail:org:hardis:diagnose",
+        "audittrail:org:diagnose:hardis",
+        "hardis:audittrail:diagnose:org",
+        "audittrail:hardis:diagnose:org",
+        "audittrail:diagnose:hardis:org",
+        "audittrail:diagnose:org:hardis"
       ]
     },
-    "hardis:org:files:import": {
+    "hardis:org:diagnose:instanceupgrade": {
       "aliases": [],
       "args": {},
-      "description": "\nThis command facilitates the mass upload of files into Salesforce, allowing you to populate records with associated documents, images, or other file types. It's a crucial tool for data migration, content seeding, or synchronizing external file repositories with Salesforce.\n\nKey functionalities:\n\n- **Configuration-Driven Import:** Relies on an `export.json` file within a designated file export project (created using `sf hardis:org:configure:files`) to determine which files to import and how they should be associated with Salesforce records.\n- **Interactive Project Selection:** If the file import project path is not provided via the `--path` flag, it interactively prompts the user to select one.\n- **Overwrite Option:** The `--overwrite` flag allows you to replace existing files in Salesforce with local versions that have the same name. Be aware that this option doubles the number of API calls used.\n- **Support for ContentVersion and Attachment:** Handles both modern Salesforce Files (ContentVersion) and older Attachments.\n\nSee this article for how to export files, which is often a prerequisite for importing:\n\n[![How to mass download notes and attachments files from a Salesforce org](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-mass-download.jpg)](https://nicolas.vuillamy.fr/how-to-mass-download-notes-and-attachments-files-from-a-salesforce-org-83a028824afd)\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **FilesImporter Class:** The core logic is encapsulated within the `FilesImporter` class, which orchestrates the entire import process.\n- **File System Scan:** Scans the local file system within the configured project directory to identify files for import.\n- **Salesforce API Interaction:** Uses Salesforce APIs (e.g., ContentVersion, Attachment) to upload files and associate them with records.\n- **Configuration Loading:** Reads the `export.json` file to get the import configuration, including SOQL queries to identify parent records for file association.\n- **Interactive Prompts:** Uses `selectFilesWorkspace` to allow the user to choose a file import project and `prompts` for confirming the overwrite behavior.\n- **Error Handling:** Includes mechanisms to handle potential errors during the import process, such as API limits or file upload failures.\n</details>\n",
+      "description": "\n## Command Behavior\n\n**Retrieves and displays the scheduled upgrade date for a Salesforce org's instance.**\n\nThis command provides crucial information about when your Salesforce instance will be upgraded to the next major release (Spring, Summer, or Winter). This is vital for release planning, testing, and ensuring compatibility with upcoming Salesforce features.\n\nKey functionalities:\n\n- **Instance Identification:** Determines the Salesforce instance name of your target org.\n- **Upgrade Date Retrieval:** Fetches the planned start time of the next major core service upgrade for that instance from the Salesforce Status API.\n- **Days Until Upgrade:** Calculates and displays the number of days remaining until the next major upgrade.\n- **Severity-Based Logging:** Adjusts the log severity (info, warning) based on the proximity of the upgrade date, providing a visual cue for urgency.\n- **Notifications:** Sends notifications to configured channels (e.g., Slack, MS Teams, Grafana) with the upgrade information, making it suitable for automated monitoring.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce SOQL Query:** It first queries the `Organization` object in Salesforce to get the `InstanceName` of the target org.\n- **Salesforce Status API Integration:** It makes an HTTP GET request to the Salesforce Status API (`https://api.status.salesforce.com/v1/instances/{instanceName}/status`) to retrieve detailed information about the instance, including scheduled maintenances.\n- **Data Parsing:** It parses the JSON response from the Status API to extract the relevant major release upgrade information.\n- **Date Calculation:** Uses the `moment` library to calculate the difference in days between the current date and the planned upgrade date.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including the instance name, upgrade date, and days remaining, along with relevant metrics for monitoring dashboards.\n- **User Feedback:** Provides clear messages to the user about the upgrade status and proximity.\n</details>\n",
       "examples": [
-        "$ sf hardis:org:files:import"
+        "$ sf hardis:org:diagnose:instanceupgrade"
       ],
       "flags": {
         "json": {
@@ -5710,21 +5695,6 @@
           "multiple": false,
           "type": "option"
         },
-        "path": {
-          "char": "p",
-          "description": "Path to the file export project",
-          "name": "path",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "overwrite": {
-          "char": "f",
-          "description": "Override existing files (doubles the number of API calls)",
-          "name": "overwrite",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -5763,13 +5733,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:files:import",
+      "id": "hardis:org:diagnose:instanceupgrade",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Import files",
+      "title": "Get Instance Upgrade date",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -5777,44 +5747,46 @@
         "commands",
         "hardis",
         "org",
-        "files",
-        "import.js"
+        "diagnose",
+        "instanceupgrade.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:files:import",
-        "org:hardis:files:import",
-        "org:files:hardis:import",
-        "org:files:import:hardis",
-        "hardis:files:org:import",
-        "files:hardis:org:import",
-        "files:org:hardis:import",
-        "files:org:import:hardis",
-        "hardis:files:import:org",
-        "files:hardis:import:org",
-        "files:import:hardis:org",
-        "files:import:org:hardis",
-        "hardis:org:import:files",
-        "org:hardis:import:files",
-        "org:import:hardis:files",
-        "org:import:files:hardis",
-        "hardis:import:org:files",
-        "import:hardis:org:files",
-        "import:org:hardis:files",
-        "import:org:files:hardis",
-        "hardis:import:files:org",
-        "import:hardis:files:org",
-        "import:files:hardis:org",
-        "import:files:org:hardis"
+        "hardis:org:diagnose:instanceupgrade",
+        "org:hardis:diagnose:instanceupgrade",
+        "org:diagnose:hardis:instanceupgrade",
+        "org:diagnose:instanceupgrade:hardis",
+        "hardis:diagnose:org:instanceupgrade",
+        "diagnose:hardis:org:instanceupgrade",
+        "diagnose:org:hardis:instanceupgrade",
+        "diagnose:org:instanceupgrade:hardis",
+        "hardis:diagnose:instanceupgrade:org",
+        "diagnose:hardis:instanceupgrade:org",
+        "diagnose:instanceupgrade:hardis:org",
+        "diagnose:instanceupgrade:org:hardis",
+        "hardis:org:instanceupgrade:diagnose",
+        "org:hardis:instanceupgrade:diagnose",
+        "org:instanceupgrade:hardis:diagnose",
+        "org:instanceupgrade:diagnose:hardis",
+        "hardis:instanceupgrade:org:diagnose",
+        "instanceupgrade:hardis:org:diagnose",
+        "instanceupgrade:org:hardis:diagnose",
+        "instanceupgrade:org:diagnose:hardis",
+        "hardis:instanceupgrade:diagnose:org",
+        "instanceupgrade:hardis:diagnose:org",
+        "instanceupgrade:diagnose:hardis:org",
+        "instanceupgrade:diagnose:org:hardis"
       ]
     },
-    "hardis:org:fix:listviewmine": {
+    "hardis:org:diagnose:legacyapi": {
       "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",
+      "description": "Checks if an org uses retired or someday retired API version\n\n\nSee article below\n\n[![Handle Salesforce API versions Deprecation like a pro](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deprecated-api.jpg)](https://nicolas.vuillamy.fr/handle-salesforce-api-versions-deprecation-like-a-pro-335065f52238)\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-deprecated-api-calls/) and can output Grafana, Slack and MsTeams Notifications.\n",
       "examples": [
-        "$ sf hardis:org:fix:listviewmine",
-        "$ sf hardis:org:fix:listviewmine --listviews Opportunity:MySubscriptions,Account:MyActivePartners"
+        "$ sf hardis:org:diagnose:legacyapi",
+        "$ sf hardis:org:diagnose:legacyapi -u hardis@myclient.com",
+        "$ sf hardis:org:diagnose:legacyapi --outputfile 'c:/path/to/folder/legacyapi.csv'",
+        "$ sf hardis:org:diagnose:legacyapi -u hardis@myclient.com --outputfile ./tmp/legacyapi.csv"
       ],
       "flags": {
         "json": {
@@ -5832,10 +5804,28 @@
           "multiple": false,
           "type": "option"
         },
-        "listviews": {
+        "eventtype": {
+          "char": "e",
+          "description": "Type of EventLogFile event to analyze",
+          "name": "eventtype",
+          "default": "ApiTotalUsage",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "limit": {
           "char": "l",
-          "description": "Comma-separated list of listviews following format Object:ListViewName\nExample: Contact:MyContacts,Contact:MyActiveContacts,Opportunity:MYClosedOpportunities",
-          "name": "listviews",
+          "description": "Number of latest EventLogFile events to analyze",
+          "name": "limit",
+          "default": 999,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "outputfile": {
+          "char": "f",
+          "description": "Force the path and name of output report file. Must end with .csv",
+          "name": "outputfile",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -5878,60 +5868,57 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:fix:listviewmine",
+      "id": "hardis:org:diagnose:legacyapi",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Fix listviews with ",
-      "requiresProject": true,
+      "title": "Check for legacy API use",
+      "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
         "org",
-        "fix",
-        "listviewmine.js"
+        "diagnose",
+        "legacyapi.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:legacyapi",
+        "org:hardis:diagnose:legacyapi",
+        "org:diagnose:hardis:legacyapi",
+        "org:diagnose:legacyapi:hardis",
+        "hardis:diagnose:org:legacyapi",
+        "diagnose:hardis:org:legacyapi",
+        "diagnose:org:hardis:legacyapi",
+        "diagnose:org:legacyapi:hardis",
+        "hardis:diagnose:legacyapi:org",
+        "diagnose:hardis:legacyapi:org",
+        "diagnose:legacyapi:hardis:org",
+        "diagnose:legacyapi:org:hardis",
+        "hardis:org:legacyapi:diagnose",
+        "org:hardis:legacyapi:diagnose",
+        "org:legacyapi:hardis:diagnose",
+        "org:legacyapi:diagnose:hardis",
+        "hardis:legacyapi:org:diagnose",
+        "legacyapi:hardis:org:diagnose",
+        "legacyapi:org:hardis:diagnose",
+        "legacyapi:org:diagnose:hardis",
+        "hardis:legacyapi:diagnose:org",
+        "legacyapi:hardis:diagnose:org",
+        "legacyapi:diagnose:hardis:org",
+        "legacyapi:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:audittrail": {
+    "hardis:org:diagnose:licenses": {
       "aliases": [],
       "args": {},
-      "description": "Export Audit trail into a CSV file with selected criteria, and highlight suspect actions\n\nAlso detects updates of Custom Settings values (disable by defining `SKIP_AUDIT_TRAIL_CUSTOM_SETTINGS=true`)\n\nRegular setup actions performed in major orgs are filtered.\n\n- \"\"\n  - createScratchOrg\n  - changedsenderemail\n  - deleteScratchOrg\n  - loginasgrantedtopartnerbt\n- Certificate and Key Management\n  - insertCertificate\n- Custom App Licenses\n  - addeduserpackagelicense\n  - granteduserpackagelicense\n  - revokeduserpackagelicense\n- Customer Portal\n  - createdcustomersuccessuser\n  - CSPUserDisabled\n- Currency\n  - updateddatedexchrate\n- Data Management\n  - queueMembership\n- Email Administration\n  - dkimRotationPreparationSuccessful\n  - dkimRotationSuccessful\n- External Objects\n  - xdsEncryptedFieldChange\n- Groups\n  - groupMembership\n- Holidays\n  - holiday_insert\n- Inbox mobile and legacy desktop apps\n  - enableSIQUserNonEAC\n  - siqUserAcceptedTOS\n- Manage Users\n  - activateduser\n  - createduser\n  - changedcommunitynickname\n  - changedemail\n  - changedfederationid\n  - changedpassword\n  - changedinteractionuseroffon\n  - changedinteractionuseronoff\n  - changedmarketinguseroffon\n  - changedmarketinguseronoff\n  - changedofflineuseroffon\n  - changedprofileforuserstdtostd\n  - changedprofileforuser\n  - changedprofileforusercusttostd\n  - changedprofileforuserstdtocust\n  - changedroleforusertonone\n  - changedroleforuser\n  - changedroleforuserfromnone\n  - changedUserAdminVerifiedStatusVerified\n  - changedUserEmailVerifiedStatusUnverified\n  - changedUserEmailVerifiedStatusVerified\n  - changedknowledgeuseroffon\n  - changedsfcontentuseroffon\n  - changedsupportuseroffon\n  - changedusername\n  - changedUserPhoneNumber\n  - changedUserPhoneVerifiedStatusUnverified\n  - changedUserPhoneVerifiedStatusVerified\n  - deactivateduser\n  - deleteAuthenticatorPairing\n  - deleteTwoFactorInfo2\n  - deleteTwoFactorTempCode\n  - frozeuser\n  - insertAuthenticatorPairing\n  - insertTwoFactorInfo2\n  - insertTwoFactorTempCode\n  - lightningloginenroll\n  - PermSetAssign\n  - PermSetGroupAssign\n  - PermSetGroupUnassign\n  - PermSetLicenseAssign\n  - PermSetUnassign\n  - PermSetLicenseUnassign\n  - registeredUserPhoneNumber\n  - resetpassword\n  - suNetworkAdminLogin\n  - suNetworkAdminLogout\n  - suOrgAdminLogin\n  - suOrgAdminLogout\n  - unfrozeuser\n  - useremailchangesent\n- Mobile Administration\n  - assigneduserstomobileconfig\n- Reporting Snapshots\n  - createdReportJob\n  - deletedReportJob\n- Sandboxes\n  - DeleteSandbox\n\nBy default, deployment user defined in .sfdx-hardis.yml targetUsername property will be excluded.\n\nYou can define additional users to exclude in .sfdx-hardis.yml **monitoringExcludeUsernames** property.\n\nYou can also add more sections / actions considered as not suspect using property **monitoringAllowedSectionsActions**\n\nExample:\n\n```yaml\nmonitoringExcludeUsernames:\n  - deploymentuser@cloudity.com\n  - marketingcloud@cloudity.com\n  - integration-user@cloudity.com\n\nmonitoringAllowedSectionsActions:\n  \"Some section\": [] // Will ignore all actions from such section\n  \"Some other section\": [\"actionType1\",\"actionType2\",\"actionType3\"] // Will ignore only those 3 actions from section \"Some other section\". Other actions in the same section will be considered as suspect.\n```\n\n## Excel output example\n\n![](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/screenshot-monitoring-audittrail-excel.jpg)\n\n## Local output example\n\n![](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/screenshot-monitoring-audittrail-local.jpg)\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-suspect-audit-trail/) and can output Grafana, Slack and MsTeams Notifications.\n",
+      "description": "\n**Lists and analyzes User Licenses and Permission Set Licenses subscribed and used in a Salesforce org.**\n\nThis command provides a comprehensive overview of your Salesforce license consumption. It's particularly useful for:\n\n- **License Management:** Understanding which licenses are active, how many are available, and how many are being used.\n- **Cost Optimization:** Identifying unused or underutilized licenses that could be reallocated or decommissioned.\n- **Compliance:** Ensuring that your organization is compliant with Salesforce licensing agreements.\n- **Monitoring:** Tracking license usage trends over time.\n\nKey functionalities:\n\n- **User License Details:** Retrieves information about standard and custom User Licenses, including `MasterLabel`, `Name`, `TotalLicenses`, and `UsedLicenses`.\n- **Permission Set License Details:** Retrieves information about Permission Set Licenses, including `MasterLabel`, `PermissionSetLicenseKey`, `TotalLicenses`, and `UsedLicenses`.\n- **Used Licenses Filter:** The `--usedonly` flag allows you to filter the report to show only licenses that have at least one `UsedLicenses` count greater than zero.\n- **CSV Report Generation:** Generates a CSV file containing all the retrieved license information, suitable for detailed analysis.\n- **Notifications:** Sends notifications to configured channels (e.g., Grafana, Slack, MS Teams) with a summary of license usage, including lists of active and used licenses.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce SOQL Queries:** It executes SOQL queries against the `UserLicense` and `PermissionSetLicense` objects in Salesforce to retrieve license data.\n- **Data Transformation:** It processes the query results, reformatting the data to be more readable and consistent for reporting purposes (e.g., removing `Id` and `attributes`, renaming `PermissionSetLicenseKey` to `Name`).\n- **Data Aggregation:** It aggregates license information, creating a `licensesByKey` object for quick lookups and a `usedLicenses` array for a concise list of actively used licenses.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of license data.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **User Feedback:** Provides clear messages to the user about the license extraction process and the used licenses.\n</details>\n",
       "examples": [
-        "$ sf hardis:org:diagnose:audittrail",
-        "$ sf hardis:org:diagnose:audittrail --excludeusers baptiste@titi.com",
-        "$ sf hardis:org:diagnose:audittrail --excludeusers baptiste@titi.com,bertrand@titi.com",
-        "$ sf hardis:org:diagnose:audittrail --lastndays 5"
+        "$ sf hardis:org:diagnose:licenses"
       ],
       "flags": {
         "json": {
@@ -5949,22 +5936,6 @@
           "multiple": false,
           "type": "option"
         },
-        "excludeusers": {
-          "char": "e",
-          "description": "Comma-separated list of usernames to exclude",
-          "name": "excludeusers",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "lastndays": {
-          "char": "t",
-          "description": "Number of days to extract from today (included)",
-          "name": "lastndays",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "outputfile": {
           "char": "f",
           "description": "Force the path and name of output report file. Must end with .csv",
@@ -5973,6 +5944,13 @@
           "multiple": false,
           "type": "option"
         },
+        "usedonly": {
+          "char": "u",
+          "description": "Filter to have only used licenses",
+          "name": "usedonly",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -6011,13 +5989,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:audittrail",
+      "id": "hardis:org:diagnose:licenses",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Diagnose content of Setup Audit Trail",
+      "title": "List licenses subscribed and used in a Salesforce org",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -6026,42 +6004,42 @@
         "hardis",
         "org",
         "diagnose",
-        "audittrail.js"
+        "licenses.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:audittrail",
-        "org:hardis:diagnose:audittrail",
-        "org:diagnose:hardis:audittrail",
-        "org:diagnose:audittrail:hardis",
-        "hardis:diagnose:org:audittrail",
-        "diagnose:hardis:org:audittrail",
-        "diagnose:org:hardis:audittrail",
-        "diagnose:org:audittrail:hardis",
-        "hardis:diagnose:audittrail:org",
-        "diagnose:hardis:audittrail:org",
-        "diagnose:audittrail:hardis:org",
-        "diagnose:audittrail:org:hardis",
-        "hardis:org:audittrail:diagnose",
-        "org:hardis:audittrail:diagnose",
-        "org:audittrail:hardis:diagnose",
-        "org:audittrail:diagnose:hardis",
-        "hardis:audittrail:org:diagnose",
-        "audittrail:hardis:org:diagnose",
-        "audittrail:org:hardis:diagnose",
-        "audittrail:org:diagnose:hardis",
-        "hardis:audittrail:diagnose:org",
-        "audittrail:hardis:diagnose:org",
-        "audittrail:diagnose:hardis:org",
-        "audittrail:diagnose:org:hardis"
+        "hardis:org:diagnose:licenses",
+        "org:hardis:diagnose:licenses",
+        "org:diagnose:hardis:licenses",
+        "org:diagnose:licenses:hardis",
+        "hardis:diagnose:org:licenses",
+        "diagnose:hardis:org:licenses",
+        "diagnose:org:hardis:licenses",
+        "diagnose:org:licenses:hardis",
+        "hardis:diagnose:licenses:org",
+        "diagnose:hardis:licenses:org",
+        "diagnose:licenses:hardis:org",
+        "diagnose:licenses:org:hardis",
+        "hardis:org:licenses:diagnose",
+        "org:hardis:licenses:diagnose",
+        "org:licenses:hardis:diagnose",
+        "org:licenses:diagnose:hardis",
+        "hardis:licenses:org:diagnose",
+        "licenses:hardis:org:diagnose",
+        "licenses:org:hardis:diagnose",
+        "licenses:org:diagnose:hardis",
+        "hardis:licenses:diagnose:org",
+        "licenses:hardis:diagnose:org",
+        "licenses:diagnose:hardis:org",
+        "licenses:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:instanceupgrade": {
+    "hardis:org:diagnose:releaseupdates": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Retrieves and displays the scheduled upgrade date for a Salesforce org's instance.**\n\nThis command provides crucial information about when your Salesforce instance will be upgraded to the next major release (Spring, Summer, or Winter). This is vital for release planning, testing, and ensuring compatibility with upcoming Salesforce features.\n\nKey functionalities:\n\n- **Instance Identification:** Determines the Salesforce instance name of your target org.\n- **Upgrade Date Retrieval:** Fetches the planned start time of the next major core service upgrade for that instance from the Salesforce Status API.\n- **Days Until Upgrade:** Calculates and displays the number of days remaining until the next major upgrade.\n- **Severity-Based Logging:** Adjusts the log severity (info, warning) based on the proximity of the upgrade date, providing a visual cue for urgency.\n- **Notifications:** Sends notifications to configured channels (e.g., Slack, MS Teams, Grafana) with the upgrade information, making it suitable for automated monitoring.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce SOQL Query:** It first queries the `Organization` object in Salesforce to get the `InstanceName` of the target org.\n- **Salesforce Status API Integration:** It makes an HTTP GET request to the Salesforce Status API (`https://api.status.salesforce.com/v1/instances/{instanceName}/status`) to retrieve detailed information about the instance, including scheduled maintenances.\n- **Data Parsing:** It parses the JSON response from the Status API to extract the relevant major release upgrade information.\n- **Date Calculation:** Uses the `moment` library to calculate the difference in days between the current date and the planned upgrade date.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including the instance name, upgrade date, and days remaining, along with relevant metrics for monitoring dashboards.\n- **User Feedback:** Provides clear messages to the user about the upgrade status and proximity.\n</details>\n",
+      "description": "Export Release Updates into a CSV file with selected criteria, and highlight Release Updates that should be checked.\n\nBefore publishing **Breaking Changes** ❌, Salesforce announce them in the setup menu [**Release Updates**](https://help.salesforce.com/s/articleView?id=sf.release_updates.htm&type=5)\n\n⚠️ Some of them are very important, because if you don't make the related upgrades in time (ex: before Winter 25) , your production org can crash !\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-release-updates/) and can output Grafana, Slack and MsTeams Notifications.\n",
       "examples": [
-        "$ sf hardis:org:diagnose:instanceupgrade"
+        "$ sf hardis:org:diagnose:releaseupdates"
       ],
       "flags": {
         "json": {
@@ -6079,6 +6057,14 @@
           "multiple": false,
           "type": "option"
         },
+        "outputfile": {
+          "char": "f",
+          "description": "Force the path and name of output report file. Must end with .csv",
+          "name": "outputfile",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -6117,13 +6103,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:instanceupgrade",
+      "id": "hardis:org:diagnose:releaseupdates",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Get Instance Upgrade date",
+      "title": "Check Release Updates of an org",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -6132,45 +6118,47 @@
         "hardis",
         "org",
         "diagnose",
-        "instanceupgrade.js"
+        "releaseupdates.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:instanceupgrade",
-        "org:hardis:diagnose:instanceupgrade",
-        "org:diagnose:hardis:instanceupgrade",
-        "org:diagnose:instanceupgrade:hardis",
-        "hardis:diagnose:org:instanceupgrade",
-        "diagnose:hardis:org:instanceupgrade",
-        "diagnose:org:hardis:instanceupgrade",
-        "diagnose:org:instanceupgrade:hardis",
-        "hardis:diagnose:instanceupgrade:org",
-        "diagnose:hardis:instanceupgrade:org",
-        "diagnose:instanceupgrade:hardis:org",
-        "diagnose:instanceupgrade:org:hardis",
-        "hardis:org:instanceupgrade:diagnose",
-        "org:hardis:instanceupgrade:diagnose",
-        "org:instanceupgrade:hardis:diagnose",
-        "org:instanceupgrade:diagnose:hardis",
-        "hardis:instanceupgrade:org:diagnose",
-        "instanceupgrade:hardis:org:diagnose",
-        "instanceupgrade:org:hardis:diagnose",
-        "instanceupgrade:org:diagnose:hardis",
-        "hardis:instanceupgrade:diagnose:org",
-        "instanceupgrade:hardis:diagnose:org",
-        "instanceupgrade:diagnose:hardis:org",
-        "instanceupgrade:diagnose:org:hardis"
+        "hardis:org:diagnose:releaseupdates",
+        "org:hardis:diagnose:releaseupdates",
+        "org:diagnose:hardis:releaseupdates",
+        "org:diagnose:releaseupdates:hardis",
+        "hardis:diagnose:org:releaseupdates",
+        "diagnose:hardis:org:releaseupdates",
+        "diagnose:org:hardis:releaseupdates",
+        "diagnose:org:releaseupdates:hardis",
+        "hardis:diagnose:releaseupdates:org",
+        "diagnose:hardis:releaseupdates:org",
+        "diagnose:releaseupdates:hardis:org",
+        "diagnose:releaseupdates:org:hardis",
+        "hardis:org:releaseupdates:diagnose",
+        "org:hardis:releaseupdates:diagnose",
+        "org:releaseupdates:hardis:diagnose",
+        "org:releaseupdates:diagnose:hardis",
+        "hardis:releaseupdates:org:diagnose",
+        "releaseupdates:hardis:org:diagnose",
+        "releaseupdates:org:hardis:diagnose",
+        "releaseupdates:org:diagnose:hardis",
+        "hardis:releaseupdates:diagnose:org",
+        "releaseupdates:hardis:diagnose:org",
+        "releaseupdates:diagnose:hardis:org",
+        "releaseupdates:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:legacyapi": {
+    "hardis:org:diagnose:storage-stats": {
       "aliases": [],
       "args": {},
-      "description": "Checks if an org uses retired or someday retired API version\n\n\nSee article below\n\n[![Handle Salesforce API versions Deprecation like a pro](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-deprecated-api.jpg)](https://nicolas.vuillamy.fr/handle-salesforce-api-versions-deprecation-like-a-pro-335065f52238)\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-deprecated-api-calls/) and can output Grafana, Slack and MsTeams Notifications.\n",
+      "description": "**Extracts and analyzes Data Storage usage for a Salesforce org, providing detailed per-object breakdowns with flexible grouping options.**\n\nThis command provides a comprehensive overview of your Salesforce data storage consumption. It's particularly useful for:\n\n- **Storage Management:** Understanding which SObjects consume the most storage and how usage has evolved over time.\n- **Cost Optimization:** Identifying storage-heavy objects that could be candidates for data archival or cleanup strategies.\n- **Capacity Planning:** Tracking storage trends to predict when additional capacity will be needed.\n- **Compliance & Governance:** Monitoring data growth patterns to ensure alignment with data retention policies.\n\nKey functionalities:\n\n- **Storage Limits Analysis:** Retrieves and displays org data storage limits, including total capacity, used storage, remaining storage, and percentage used. Detects and alerts on over-usage scenarios.\n- **SObject Discovery & Filtering:** Automatically discovers all SObjects in the org and filters them to focus on production/custom objects (excludes metadata types, platform-only objects, and cached empty objects).\n- **Interactive Selection:** Prompts the user to select which SObjects to analyze and choose breakdown fields (date fields, RecordType, custom fields, or relationship fields).\n- **Flexible Breakdown Field:** Supports grouping by any field including:\n  - Date/DateTime fields (`CreatedDate`, `LastModifiedDate`, custom date fields)\n  - RecordType (`RecordType.Name`)\n  - Custom fields (`Status__c`, picklists, text fields)\n  - Nested relationship fields (`SBQQ__Quote__r.RecordType.Name`)\n- **Date Granularity Options:** For date/datetime fields, choose between:\n  - Year-based grouping (`CALENDAR_YEAR`)\n  - Month-based grouping (`CALENDAR_MONTH`)\n  - Day-based grouping (exact date)\n- **WHERE Clause Filtering:** Apply SOQL WHERE conditions to filter records before calculating storage (e.g., only active records, records from the last year).\n- **Storage Estimation:** Estimates storage usage for each object using an average record size heuristic (2 KB per record) and calculates the percentage of org quota consumed.\n- **Dual CSV Reports:** Generates two CSV files: a detailed breakdown by selected field and a totals-per-object summary, both suitable for spreadsheet analysis and reporting.\n- **Empty Objects Cache:** Maintains a per-user cache of objects detected with zero records to optimize subsequent runs by skipping empty tables.\n- **Progress Tracking:** Sends WebSocket progress messages for integration with external UIs and monitoring dashboards.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Limits Retrieval:** Calls `conn.limits()` to retrieve the `DataStorageMB` object containing `Max` and `Remaining` values. Handles negative `Remaining` values (over-usage scenarios) by calculating `overUsageMB` and adjusting display values.\n- **SObject Discovery:** Uses `conn.metadata.list([{ type: 'CustomObject' }])` to get custom objects and `conn.describeGlobal()` to get all SObjects. Filters by object capabilities (`layoutable`, `queryable`, `retrieveable`, `createable`, `updateable`, `deletable`) and excludes metadata types (`__mdt` suffix) and cached empty objects.\n- **User Interaction:** Uses `prompts` for interactive multi-select of SObjects, breakdown field selection, granularity choice (for date fields), and optional WHERE conditions. All objects are pre-selected by default for user convenience.\n- **Field Validation:** Recursively validates breakdown fields including nested relationships (e.g., `SBQQ__Quote__r.RecordType.Name`) by traversing the relationship chain and checking field existence on each related object. Automatically handles special cases like `RecordType` -> `RecordTypeId` and `__r` -> `__c` conversions.\n- **Dynamic Query Generation:** Builds SOQL queries based on field type and granularity:\n  - For date fields with year granularity: `SELECT CALENDAR_YEAR(<Field>) breakdown, COUNT(Id) total FROM <SObject> [WHERE ...] GROUP BY CALENDAR_YEAR(<Field>) ORDER BY CALENDAR_YEAR(<Field>)`\n  - For date fields with month granularity: `SELECT CALENDAR_YEAR(<Field>) year, CALENDAR_MONTH(<Field>) month, COUNT(Id) total FROM <SObject> [WHERE ...] GROUP BY CALENDAR_YEAR(<Field>), CALENDAR_MONTH(<Field>) ORDER BY CALENDAR_YEAR(<Field>), CALENDAR_MONTH(<Field>)`\n  - For non-date fields: `SELECT <Field> breakdown, COUNT(Id) total FROM <SObject> [WHERE ...] GROUP BY <Field> ORDER BY <Field>`\n- **WHERE Clause Support:** Accepts user-provided WHERE conditions via flag (`--where`) or interactive prompt. Injects the condition into all SOQL queries for consistent filtering across all objects.\n- **Storage Calculation:** Applies a conservative average record size of 2 KB (2048 bytes) to estimate storage consumption. Calculates both MB usage and percentage of org quota for each object and breakdown value.\n- **Report Generation:** Uses `generateCsvFile` and `generateReportPath` helpers to create two CSV files in the reports directory:\n  - Detailed breakdown: includes all statistics per breakdown value per object (e.g., by year, by month, by RecordType)\n  - Totals summary: includes only aggregate totals per object\n  - File naming includes breakdown field, granularity (for date fields), and `-filtered` suffix when WHERE clause is applied\n- **Caching Mechanism:** Writes a JSON cache file per authenticated username (sanitized) in the reports directory (`<username>_empty_tables_cache.json`) containing an array of empty object names. The cache is updated after each run with newly detected empty objects.\n- **Progress & UX:** Uses `WebSocketClient` to emit start/step/end progress messages for external monitoring. Outputs summary tables with `uxLogTable` and status messages with `uxLog`.\n- **Return Value:** Returns a JSON object containing `tableStorageInfos` (all rows), `tableStorageInfosTotals` (summary rows), `storageLimits` (org limits object), and `outputFiles` (paths to generated CSV/XLSX reports).\n</details>\n\n![](https://sfdx-hardis.cloudity.com/assets/images/storage-usage-year-breakdown.png)\n\n![](https://sfdx-hardis.cloudity.com/assets/images/storage-usage-total.png)\n",
       "examples": [
-        "$ sf hardis:org:diagnose:legacyapi",
-        "$ sf hardis:org:diagnose:legacyapi -u hardis@myclient.com",
-        "$ sf hardis:org:diagnose:legacyapi --outputfile 'c:/path/to/folder/legacyapi.csv'",
-        "$ sf hardis:org:diagnose:legacyapi -u hardis@myclient.com --outputfile ./tmp/legacyapi.csv"
+        "$ sf hardis:org:diagnose:storage-stats",
+        "$ sf hardis:org:diagnose:storage-stats --breakdown-field \"CreatedDate\"",
+        "$ sf hardis:org:diagnose:storage-stats -b \"RecordType.Name\"",
+        "$ sf hardis:org:diagnose:storage-stats --where \"CreatedDate = LAST_N_DAYS:365\"",
+        "$ sf hardis:org:diagnose:storage-stats -w \"Status__c = 'Active'\"",
+        "$ sf hardis:org:diagnose:storage-stats -b \"LastModifiedDate\" -w \"IsDeleted = false\""
       ],
       "flags": {
         "json": {
@@ -6188,28 +6176,26 @@
           "multiple": false,
           "type": "option"
         },
-        "eventtype": {
-          "char": "e",
-          "description": "Type of EventLogFile event to analyze",
-          "name": "eventtype",
-          "default": "ApiTotalUsage",
+        "outputfile": {
+          "char": "f",
+          "description": "Force the path and name of output report file. Must end with .csv",
+          "name": "outputfile",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "limit": {
-          "char": "l",
-          "description": "Number of latest EventLogFile events to analyze",
-          "name": "limit",
-          "default": 999,
+        "breakdown-field": {
+          "char": "b",
+          "description": "Field to use for storage stats breakdown. Example: \"CreatedDate\", \"LastModifiedDate\", \"RecordType.Name\", or custom fields like \"Status__c\"",
+          "name": "breakdown-field",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "outputfile": {
-          "char": "f",
-          "description": "Force the path and name of output report file. Must end with .csv",
-          "name": "outputfile",
+        "where": {
+          "char": "w",
+          "description": "WHERE clause to filter records in the query (without the WHERE keyword). Example: \"CreatedDate = LAST_N_DAYS:365\" or \"Status__c = 'Active'\"",
+          "name": "where",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -6252,57 +6238,57 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:legacyapi",
+      "id": "hardis:org:diagnose:storage-stats",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Check for legacy API use",
-      "requiresProject": false,
+      "title": "Extract Data Storage stats",
+      "requiresProject": true,
       "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "org",
-        "diagnose",
-        "legacyapi.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:org:diagnose:legacyapi",
-        "org:hardis:diagnose:legacyapi",
-        "org:diagnose:hardis:legacyapi",
-        "org:diagnose:legacyapi:hardis",
-        "hardis:diagnose:org:legacyapi",
-        "diagnose:hardis:org:legacyapi",
-        "diagnose:org:hardis:legacyapi",
-        "diagnose:org:legacyapi:hardis",
-        "hardis:diagnose:legacyapi:org",
-        "diagnose:hardis:legacyapi:org",
-        "diagnose:legacyapi:hardis:org",
-        "diagnose:legacyapi:org:hardis",
-        "hardis:org:legacyapi:diagnose",
-        "org:hardis:legacyapi:diagnose",
-        "org:legacyapi:hardis:diagnose",
-        "org:legacyapi:diagnose:hardis",
-        "hardis:legacyapi:org:diagnose",
-        "legacyapi:hardis:org:diagnose",
-        "legacyapi:org:hardis:diagnose",
-        "legacyapi:org:diagnose:hardis",
-        "hardis:legacyapi:diagnose:org",
-        "legacyapi:hardis:diagnose:org",
-        "legacyapi:diagnose:hardis:org",
-        "legacyapi:diagnose:org:hardis"
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "org",
+        "diagnose",
+        "storage-stats.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:org:diagnose:storage-stats",
+        "org:hardis:diagnose:storage-stats",
+        "org:diagnose:hardis:storage-stats",
+        "org:diagnose:storage-stats:hardis",
+        "hardis:diagnose:org:storage-stats",
+        "diagnose:hardis:org:storage-stats",
+        "diagnose:org:hardis:storage-stats",
+        "diagnose:org:storage-stats:hardis",
+        "hardis:diagnose:storage-stats:org",
+        "diagnose:hardis:storage-stats:org",
+        "diagnose:storage-stats:hardis:org",
+        "diagnose:storage-stats:org:hardis",
+        "hardis:org:storage-stats:diagnose",
+        "org:hardis:storage-stats:diagnose",
+        "org:storage-stats:hardis:diagnose",
+        "org:storage-stats:diagnose:hardis",
+        "hardis:storage-stats:org:diagnose",
+        "storage-stats:hardis:org:diagnose",
+        "storage-stats:org:hardis:diagnose",
+        "storage-stats:org:diagnose:hardis",
+        "hardis:storage-stats:diagnose:org",
+        "storage-stats:hardis:diagnose:org",
+        "storage-stats:diagnose:hardis:org",
+        "storage-stats:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:licenses": {
+    "hardis:org:diagnose:unsecure-connected-apps": {
       "aliases": [],
       "args": {},
-      "description": "\n**Lists and analyzes User Licenses and Permission Set Licenses subscribed and used in a Salesforce org.**\n\nThis command provides a comprehensive overview of your Salesforce license consumption. It's particularly useful for:\n\n- **License Management:** Understanding which licenses are active, how many are available, and how many are being used.\n- **Cost Optimization:** Identifying unused or underutilized licenses that could be reallocated or decommissioned.\n- **Compliance:** Ensuring that your organization is compliant with Salesforce licensing agreements.\n- **Monitoring:** Tracking license usage trends over time.\n\nKey functionalities:\n\n- **User License Details:** Retrieves information about standard and custom User Licenses, including `MasterLabel`, `Name`, `TotalLicenses`, and `UsedLicenses`.\n- **Permission Set License Details:** Retrieves information about Permission Set Licenses, including `MasterLabel`, `PermissionSetLicenseKey`, `TotalLicenses`, and `UsedLicenses`.\n- **Used Licenses Filter:** The `--usedonly` flag allows you to filter the report to show only licenses that have at least one `UsedLicenses` count greater than zero.\n- **CSV Report Generation:** Generates a CSV file containing all the retrieved license information, suitable for detailed analysis.\n- **Notifications:** Sends notifications to configured channels (e.g., Grafana, Slack, MS Teams) with a summary of license usage, including lists of active and used licenses.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce SOQL Queries:** It executes SOQL queries against the `UserLicense` and `PermissionSetLicense` objects in Salesforce to retrieve license data.\n- **Data Transformation:** It processes the query results, reformatting the data to be more readable and consistent for reporting purposes (e.g., removing `Id` and `attributes`, renaming `PermissionSetLicenseKey` to `Name`).\n- **Data Aggregation:** It aggregates license information, creating a `licensesByKey` object for quick lookups and a `usedLicenses` array for a concise list of actively used licenses.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of license data.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **User Feedback:** Provides clear messages to the user about the license extraction process and the used licenses.\n</details>\n",
+      "description": "\n## Command Behavior\n\n**Detects unsecured Connected Apps in a Salesforce org and generates detailed reports for security analysis.**\n\nThis command is a critical security diagnostic tool that helps administrators identify Connected Apps that may pose security risks due to improper configuration. It provides comprehensive analysis of OAuth tokens and Connected App security settings to ensure proper access control.\n\nKey functionalities:\n\n- **OAuth Token Analysis:** Queries all OAuth tokens in the org using SOQL to retrieve comprehensive token information including app names, users, authorization status, and usage statistics.\n- **Security Status Assessment:** Evaluates each Connected App's security configuration by checking the `IsUsingAdminAuthorization` flag to determine if admin pre-approval is required.\n- **Unsecured App Detection:** Identifies Connected Apps that allow users to authorize themselves without admin approval, which can pose security risks.\n- **Detailed Reporting:** Generates two comprehensive CSV reports:\n  - **OAuth Tokens Report:** Lists all OAuth tokens with security status, user information, and usage data\n  - **Connected Apps Summary:** Aggregates unsecured Connected Apps with counts of associated OAuth tokens\n- **Visual Indicators:** Uses status icons (❌ for unsecured, ✅ for secured) to provide immediate visual feedback on security status.\n- **Security Recommendations:** Provides actionable guidance on how to secure Connected Apps through proper configuration.\n- **Notifications:** Sends alerts to configured channels (Grafana, Slack, MS Teams) with security findings and attached reports.\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-org-security/) and can output Grafana, Slack and MsTeams Notifications.\n\n<iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/jHv8yrSK8Dg\" 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 involves:\n\n- **SOQL Query Execution:** Executes a comprehensive SOQL query on the `OauthToken` object, joining with `AppMenuItem` and `User` objects to gather complete security context.\n- **Security Analysis Logic:** Analyzes the `AppMenuItem.IsUsingAdminAuthorization` field to determine if a Connected App requires admin pre-approval for user authorization.\n- **Data Transformation:** Processes raw SOQL results to add security status indicators and reorganize data for optimal reporting and analysis.\n- **Aggregation Processing:** Groups OAuth tokens by Connected App name to provide summary statistics and identify the most problematic applications.\n- **Report Generation:** Uses `generateCsvFile` to create structured CSV reports with proper formatting and metadata for easy analysis and sharing.\n- **Notification Integration:** Integrates with the `NotifProvider` to send security alerts with detailed metrics, including the number of unsecured Connected Apps and associated OAuth tokens.\n- **File Management:** Generates multiple output formats (CSV, XLSX) and manages file paths using `generateReportPath` for consistent report organization.\n- **Connection Management:** Uses `setConnectionVariables` to ensure proper authentication context for notification providers that require org connection details.\n</details>\n",
       "examples": [
-        "$ sf hardis:org:diagnose:licenses"
+        "$ sf hardis:org:diagnose:unsecure-connected-apps"
       ],
       "flags": {
         "json": {
@@ -6328,13 +6314,6 @@
           "multiple": false,
           "type": "option"
         },
-        "usedonly": {
-          "char": "u",
-          "description": "Filter to have only used licenses",
-          "name": "usedonly",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -6373,13 +6352,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:licenses",
+      "id": "hardis:org:diagnose:unsecure-connected-apps",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "List licenses subscribed and used in a Salesforce org",
+      "title": "Detect Unsecured Connected Apps",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -6388,42 +6367,43 @@
         "hardis",
         "org",
         "diagnose",
-        "licenses.js"
+        "unsecure-connected-apps.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:licenses",
-        "org:hardis:diagnose:licenses",
-        "org:diagnose:hardis:licenses",
-        "org:diagnose:licenses:hardis",
-        "hardis:diagnose:org:licenses",
-        "diagnose:hardis:org:licenses",
-        "diagnose:org:hardis:licenses",
-        "diagnose:org:licenses:hardis",
-        "hardis:diagnose:licenses:org",
-        "diagnose:hardis:licenses:org",
-        "diagnose:licenses:hardis:org",
-        "diagnose:licenses:org:hardis",
-        "hardis:org:licenses:diagnose",
-        "org:hardis:licenses:diagnose",
-        "org:licenses:hardis:diagnose",
-        "org:licenses:diagnose:hardis",
-        "hardis:licenses:org:diagnose",
-        "licenses:hardis:org:diagnose",
-        "licenses:org:hardis:diagnose",
-        "licenses:org:diagnose:hardis",
-        "hardis:licenses:diagnose:org",
-        "licenses:hardis:diagnose:org",
-        "licenses:diagnose:hardis:org",
-        "licenses:diagnose:org:hardis"
+        "hardis:org:diagnose:unsecure-connected-apps",
+        "org:hardis:diagnose:unsecure-connected-apps",
+        "org:diagnose:hardis:unsecure-connected-apps",
+        "org:diagnose:unsecure-connected-apps:hardis",
+        "hardis:diagnose:org:unsecure-connected-apps",
+        "diagnose:hardis:org:unsecure-connected-apps",
+        "diagnose:org:hardis:unsecure-connected-apps",
+        "diagnose:org:unsecure-connected-apps:hardis",
+        "hardis:diagnose:unsecure-connected-apps:org",
+        "diagnose:hardis:unsecure-connected-apps:org",
+        "diagnose:unsecure-connected-apps:hardis:org",
+        "diagnose:unsecure-connected-apps:org:hardis",
+        "hardis:org:unsecure-connected-apps:diagnose",
+        "org:hardis:unsecure-connected-apps:diagnose",
+        "org:unsecure-connected-apps:hardis:diagnose",
+        "org:unsecure-connected-apps:diagnose:hardis",
+        "hardis:unsecure-connected-apps:org:diagnose",
+        "unsecure-connected-apps:hardis:org:diagnose",
+        "unsecure-connected-apps:org:hardis:diagnose",
+        "unsecure-connected-apps:org:diagnose:hardis",
+        "hardis:unsecure-connected-apps:diagnose:org",
+        "unsecure-connected-apps:hardis:diagnose:org",
+        "unsecure-connected-apps:diagnose:hardis:org",
+        "unsecure-connected-apps:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:releaseupdates": {
+    "hardis:org:diagnose:unused-apex-classes": {
       "aliases": [],
       "args": {},
-      "description": "Export Release Updates into a CSV file with selected criteria, and highlight Release Updates that should be checked.\n\nBefore publishing **Breaking Changes** ❌, Salesforce announce them in the setup menu [**Release Updates**](https://help.salesforce.com/s/articleView?id=sf.release_updates.htm&type=5)\n\n⚠️ Some of them are very important, because if you don't make the related upgrades in time (ex: before Winter 25) , your production org can crash !\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-release-updates/) and can output Grafana, Slack and MsTeams Notifications.\n",
+      "description": "List all async Apex classes (Batch,Queueable,Schedulable) that has not been called for more than 365 days.\n  \nThe result class list probably can be removed from the project, and that will improve your test classes performances 😊\n\nThe number of unused day is overridable using --days option. \n\nThe command uses queries on AsyncApexJob and CronTrigger technical tables to build the result.\n\nApex Classes CreatedBy and CreatedOn fields are calculated from MIN(date from git, date from org)\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-unused-apex-classes/) and can output Grafana, Slack and MsTeams Notifications.\n\n![](https://sfdx-hardis.cloudity.com/assets/images/screenshot-monitoring-unused-apex-grafana.jpg)\n",
       "examples": [
-        "$ sf hardis:org:diagnose:releaseupdates"
+        "$ sf hardis:org:diagnose:unused-apex-classes",
+        "$ sf hardis:org:diagnose:unused-apex-classes --days 700"
       ],
       "flags": {
         "json": {
@@ -6449,6 +6429,14 @@
           "multiple": false,
           "type": "option"
         },
+        "days": {
+          "char": "t",
+          "description": "Extracts the users that have been inactive for the amount of days specified. In CI, default is 180 days",
+          "name": "days",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -6487,13 +6475,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:releaseupdates",
+      "id": "hardis:org:diagnose:unused-apex-classes",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Check Release Updates of an org",
+      "title": "Detect unused Apex classes in an org",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -6502,47 +6490,42 @@
         "hardis",
         "org",
         "diagnose",
-        "releaseupdates.js"
+        "unused-apex-classes.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:releaseupdates",
-        "org:hardis:diagnose:releaseupdates",
-        "org:diagnose:hardis:releaseupdates",
-        "org:diagnose:releaseupdates:hardis",
-        "hardis:diagnose:org:releaseupdates",
-        "diagnose:hardis:org:releaseupdates",
-        "diagnose:org:hardis:releaseupdates",
-        "diagnose:org:releaseupdates:hardis",
-        "hardis:diagnose:releaseupdates:org",
-        "diagnose:hardis:releaseupdates:org",
-        "diagnose:releaseupdates:hardis:org",
-        "diagnose:releaseupdates:org:hardis",
-        "hardis:org:releaseupdates:diagnose",
-        "org:hardis:releaseupdates:diagnose",
-        "org:releaseupdates:hardis:diagnose",
-        "org:releaseupdates:diagnose:hardis",
-        "hardis:releaseupdates:org:diagnose",
-        "releaseupdates:hardis:org:diagnose",
-        "releaseupdates:org:hardis:diagnose",
-        "releaseupdates:org:diagnose:hardis",
-        "hardis:releaseupdates:diagnose:org",
-        "releaseupdates:hardis:diagnose:org",
-        "releaseupdates:diagnose:hardis:org",
-        "releaseupdates:diagnose:org:hardis"
+        "hardis:org:diagnose:unused-apex-classes",
+        "org:hardis:diagnose:unused-apex-classes",
+        "org:diagnose:hardis:unused-apex-classes",
+        "org:diagnose:unused-apex-classes:hardis",
+        "hardis:diagnose:org:unused-apex-classes",
+        "diagnose:hardis:org:unused-apex-classes",
+        "diagnose:org:hardis:unused-apex-classes",
+        "diagnose:org:unused-apex-classes:hardis",
+        "hardis:diagnose:unused-apex-classes:org",
+        "diagnose:hardis:unused-apex-classes:org",
+        "diagnose:unused-apex-classes:hardis:org",
+        "diagnose:unused-apex-classes:org:hardis",
+        "hardis:org:unused-apex-classes:diagnose",
+        "org:hardis:unused-apex-classes:diagnose",
+        "org:unused-apex-classes:hardis:diagnose",
+        "org:unused-apex-classes:diagnose:hardis",
+        "hardis:unused-apex-classes:org:diagnose",
+        "unused-apex-classes:hardis:org:diagnose",
+        "unused-apex-classes:org:hardis:diagnose",
+        "unused-apex-classes:org:diagnose:hardis",
+        "hardis:unused-apex-classes:diagnose:org",
+        "unused-apex-classes:hardis:diagnose:org",
+        "unused-apex-classes:diagnose:hardis:org",
+        "unused-apex-classes:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:storage-stats": {
+    "hardis:org:diagnose:unused-connected-apps": {
       "aliases": [],
       "args": {},
-      "description": "**Extracts and analyzes Data Storage usage for a Salesforce org, providing detailed per-object breakdowns with flexible grouping options.**\n\nThis command provides a comprehensive overview of your Salesforce data storage consumption. It's particularly useful for:\n\n- **Storage Management:** Understanding which SObjects consume the most storage and how usage has evolved over time.\n- **Cost Optimization:** Identifying storage-heavy objects that could be candidates for data archival or cleanup strategies.\n- **Capacity Planning:** Tracking storage trends to predict when additional capacity will be needed.\n- **Compliance & Governance:** Monitoring data growth patterns to ensure alignment with data retention policies.\n\nKey functionalities:\n\n- **Storage Limits Analysis:** Retrieves and displays org data storage limits, including total capacity, used storage, remaining storage, and percentage used. Detects and alerts on over-usage scenarios.\n- **SObject Discovery & Filtering:** Automatically discovers all SObjects in the org and filters them to focus on production/custom objects (excludes metadata types, platform-only objects, and cached empty objects).\n- **Interactive Selection:** Prompts the user to select which SObjects to analyze and choose breakdown fields (date fields, RecordType, custom fields, or relationship fields).\n- **Flexible Breakdown Field:** Supports grouping by any field including:\n  - Date/DateTime fields (`CreatedDate`, `LastModifiedDate`, custom date fields)\n  - RecordType (`RecordType.Name`)\n  - Custom fields (`Status__c`, picklists, text fields)\n  - Nested relationship fields (`SBQQ__Quote__r.RecordType.Name`)\n- **Date Granularity Options:** For date/datetime fields, choose between:\n  - Year-based grouping (`CALENDAR_YEAR`)\n  - Month-based grouping (`CALENDAR_MONTH`)\n  - Day-based grouping (exact date)\n- **WHERE Clause Filtering:** Apply SOQL WHERE conditions to filter records before calculating storage (e.g., only active records, records from the last year).\n- **Storage Estimation:** Estimates storage usage for each object using an average record size heuristic (2 KB per record) and calculates the percentage of org quota consumed.\n- **Dual CSV Reports:** Generates two CSV files: a detailed breakdown by selected field and a totals-per-object summary, both suitable for spreadsheet analysis and reporting.\n- **Empty Objects Cache:** Maintains a per-user cache of objects detected with zero records to optimize subsequent runs by skipping empty tables.\n- **Progress Tracking:** Sends WebSocket progress messages for integration with external UIs and monitoring dashboards.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Limits Retrieval:** Calls `conn.limits()` to retrieve the `DataStorageMB` object containing `Max` and `Remaining` values. Handles negative `Remaining` values (over-usage scenarios) by calculating `overUsageMB` and adjusting display values.\n- **SObject Discovery:** Uses `conn.metadata.list([{ type: 'CustomObject' }])` to get custom objects and `conn.describeGlobal()` to get all SObjects. Filters by object capabilities (`layoutable`, `queryable`, `retrieveable`, `createable`, `updateable`, `deletable`) and excludes metadata types (`__mdt` suffix) and cached empty objects.\n- **User Interaction:** Uses `prompts` for interactive multi-select of SObjects, breakdown field selection, granularity choice (for date fields), and optional WHERE conditions. All objects are pre-selected by default for user convenience.\n- **Field Validation:** Recursively validates breakdown fields including nested relationships (e.g., `SBQQ__Quote__r.RecordType.Name`) by traversing the relationship chain and checking field existence on each related object. Automatically handles special cases like `RecordType` -> `RecordTypeId` and `__r` -> `__c` conversions.\n- **Dynamic Query Generation:** Builds SOQL queries based on field type and granularity:\n  - For date fields with year granularity: `SELECT CALENDAR_YEAR(<Field>) breakdown, COUNT(Id) total FROM <SObject> [WHERE ...] GROUP BY CALENDAR_YEAR(<Field>) ORDER BY CALENDAR_YEAR(<Field>)`\n  - For date fields with month granularity: `SELECT CALENDAR_YEAR(<Field>) year, CALENDAR_MONTH(<Field>) month, COUNT(Id) total FROM <SObject> [WHERE ...] GROUP BY CALENDAR_YEAR(<Field>), CALENDAR_MONTH(<Field>) ORDER BY CALENDAR_YEAR(<Field>), CALENDAR_MONTH(<Field>)`\n  - For non-date fields: `SELECT <Field> breakdown, COUNT(Id) total FROM <SObject> [WHERE ...] GROUP BY <Field> ORDER BY <Field>`\n- **WHERE Clause Support:** Accepts user-provided WHERE conditions via flag (`--where`) or interactive prompt. Injects the condition into all SOQL queries for consistent filtering across all objects.\n- **Storage Calculation:** Applies a conservative average record size of 2 KB (2048 bytes) to estimate storage consumption. Calculates both MB usage and percentage of org quota for each object and breakdown value.\n- **Report Generation:** Uses `generateCsvFile` and `generateReportPath` helpers to create two CSV files in the reports directory:\n  - Detailed breakdown: includes all statistics per breakdown value per object (e.g., by year, by month, by RecordType)\n  - Totals summary: includes only aggregate totals per object\n  - File naming includes breakdown field, granularity (for date fields), and `-filtered` suffix when WHERE clause is applied\n- **Caching Mechanism:** Writes a JSON cache file per authenticated username (sanitized) in the reports directory (`<username>_empty_tables_cache.json`) containing an array of empty object names. The cache is updated after each run with newly detected empty objects.\n- **Progress & UX:** Uses `WebSocketClient` to emit start/step/end progress messages for external monitoring. Outputs summary tables with `uxLogTable` and status messages with `uxLog`.\n- **Return Value:** Returns a JSON object containing `tableStorageInfos` (all rows), `tableStorageInfosTotals` (summary rows), `storageLimits` (org limits object), and `outputFiles` (paths to generated CSV/XLSX reports).\n</details>\n\n![](https://sfdx-hardis.cloudity.com/assets/images/storage-usage-year-breakdown.png)\n\n![](https://sfdx-hardis.cloudity.com/assets/images/storage-usage-total.png)\n",
+      "description": "\n## Command Behavior\n\n**Identifies and reports on potentially unused Connected Apps in a Salesforce org, suggesting candidates for deletion or deactivation.**\n\nThis command helps improve org security and reduce technical debt by pinpointing Connected Apps that are no longer actively used. Connected Apps can pose security risks if left unmonitored, and cleaning them up contributes to a healthier Salesforce environment.\n\nKey functionalities:\n\n- **Connected App Data Collection:** Gathers information about all Connected Apps in the org, including creation and last modified dates, and associated users.\n- **Usage Analysis:** Analyzes `LoginHistory` and `OAuthToken` records to determine the last usage date of each Connected App.\n- **Inactivity Detection:** Flags Connected Apps as potentially unused if they have no recent login history or OAuth token usage.\n- **Accessibility Check:** Examines Connected App metadata to identify if they are accessible (e.g., if they require admin approval and have no profiles or permission sets assigned).\n- **Ignored Apps:** Automatically ignores a predefined list of common Salesforce Connected Apps (e.g., `Salesforce CLI`, `Salesforce Mobile Dashboards`). You can extend this list by defining the `ALLOWED_INACTIVE_CONNECTED_APPS` environment variable.\n- **CSV Report Generation:** Generates a CSV file containing details of all analyzed Connected Apps, including their usage status, last usage date, and reasons for being flagged as potentially unused.\n- **Notifications:** Sends notifications to configured channels (Grafana, Slack, MS Teams) with a summary of potentially unused Connected Apps.\n\n**Default Ignored Connected Apps:**\n\n- Ant Migration Tool\n- Chatter Desktop\n- Chatter Mobile for BlackBerry\n- Force.com IDE\n- OIQ_Integration\n- Salesforce CLI\n- Salesforce Files\n- Salesforce Mobile Dashboards\n- Salesforce Touch\n- Salesforce for Outlook\n- SalesforceA\n- SalesforceA for Android\n- SalesforceA for iOS\n- SalesforceDX Namespace Registry\n- SalesforceIQ\n\nYou can add more ignored apps by defining a comma-separated list of names in the `ALLOWED_INACTIVE_CONNECTED_APPS` environment variable.\n\n_Example: \nALLOWED_INACTIVE_CONNECTED_APPS=My App 1,My App 2, My App 3_\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-unused-connected-apps/) and can output Grafana, Slack and MsTeams Notifications.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce SOQL Queries:** It performs SOQL queries against `ConnectedApplication`, `LoginHistory`, and `OAuthToken` objects to gather comprehensive data about Connected Apps and their usage.\n- **Temporary SFDX Project:** It creates a temporary SFDX project to retrieve Connected App metadata, allowing for local parsing and analysis of their XML files.\n- **Metadata Parsing:** It parses the `connectedApp-meta.xml` files to check for `isAdminApproved` and the presence of `profileName` or `permissionsetName` to determine accessibility.\n- **Data Correlation:** It correlates data from various Salesforce objects to build a complete picture of each Connected App's usage and status.\n- **Date Calculation:** Uses `moment` to calculate the time since the last OAuth token usage.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of unused Connected Apps.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **File System Operations:** Uses `fs-extra` for creating and removing temporary directories and files.\n- **Environment Variable Reading:** Reads the `ALLOWED_INACTIVE_CONNECTED_APPS` environment variable to customize the list of ignored Connected Apps.\n</details>\n",
       "examples": [
-        "$ sf hardis:org:diagnose:storage-stats",
-        "$ sf hardis:org:diagnose:storage-stats --breakdown-field \"CreatedDate\"",
-        "$ sf hardis:org:diagnose:storage-stats -b \"RecordType.Name\"",
-        "$ sf hardis:org:diagnose:storage-stats --where \"CreatedDate = LAST_N_DAYS:365\"",
-        "$ sf hardis:org:diagnose:storage-stats -w \"Status__c = 'Active'\"",
-        "$ sf hardis:org:diagnose:storage-stats -b \"LastModifiedDate\" -w \"IsDeleted = false\""
+        "$ sf hardis:org:diagnose:unused-connected-apps"
       ],
       "flags": {
         "json": {
@@ -6568,22 +6551,6 @@
           "multiple": false,
           "type": "option"
         },
-        "breakdown-field": {
-          "char": "b",
-          "description": "Field to use for storage stats breakdown. Example: \"CreatedDate\", \"LastModifiedDate\", \"RecordType.Name\", or custom fields like \"Status__c\"",
-          "name": "breakdown-field",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "where": {
-          "char": "w",
-          "description": "WHERE clause to filter records in the query (without the WHERE keyword). Example: \"CreatedDate = LAST_N_DAYS:365\" or \"Status__c = 'Active'\"",
-          "name": "where",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -6622,14 +6589,31 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:storage-stats",
+      "id": "hardis:org:diagnose:unused-connected-apps",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Extract Data Storage stats",
-      "requiresProject": true,
+      "title": "Unused Connected Apps in an org",
+      "allowedInactiveConnectedApps": [
+        "Ant Migration Tool",
+        "Chatter Desktop",
+        "Chatter Mobile for BlackBerry",
+        "Force.com IDE",
+        "OIQ_Integration",
+        "Salesforce CLI",
+        "Salesforce Files",
+        "Salesforce Mobile Dashboards",
+        "Salesforce Touch",
+        "Salesforce for Outlook",
+        "SalesforceA",
+        "SalesforceA for Android",
+        "SalesforceA for iOS",
+        "SalesforceDX Namespace Registry",
+        "SalesforceIQ"
+      ],
+      "requiresProject": false,
       "isESM": true,
       "relativePath": [
         "lib",
@@ -6637,42 +6621,43 @@
         "hardis",
         "org",
         "diagnose",
-        "storage-stats.js"
+        "unused-connected-apps.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:storage-stats",
-        "org:hardis:diagnose:storage-stats",
-        "org:diagnose:hardis:storage-stats",
-        "org:diagnose:storage-stats:hardis",
-        "hardis:diagnose:org:storage-stats",
-        "diagnose:hardis:org:storage-stats",
-        "diagnose:org:hardis:storage-stats",
-        "diagnose:org:storage-stats:hardis",
-        "hardis:diagnose:storage-stats:org",
-        "diagnose:hardis:storage-stats:org",
-        "diagnose:storage-stats:hardis:org",
-        "diagnose:storage-stats:org:hardis",
-        "hardis:org:storage-stats:diagnose",
-        "org:hardis:storage-stats:diagnose",
-        "org:storage-stats:hardis:diagnose",
-        "org:storage-stats:diagnose:hardis",
-        "hardis:storage-stats:org:diagnose",
-        "storage-stats:hardis:org:diagnose",
-        "storage-stats:org:hardis:diagnose",
-        "storage-stats:org:diagnose:hardis",
-        "hardis:storage-stats:diagnose:org",
-        "storage-stats:hardis:diagnose:org",
-        "storage-stats:diagnose:hardis:org",
-        "storage-stats:diagnose:org:hardis"
+        "hardis:org:diagnose:unused-connected-apps",
+        "org:hardis:diagnose:unused-connected-apps",
+        "org:diagnose:hardis:unused-connected-apps",
+        "org:diagnose:unused-connected-apps:hardis",
+        "hardis:diagnose:org:unused-connected-apps",
+        "diagnose:hardis:org:unused-connected-apps",
+        "diagnose:org:hardis:unused-connected-apps",
+        "diagnose:org:unused-connected-apps:hardis",
+        "hardis:diagnose:unused-connected-apps:org",
+        "diagnose:hardis:unused-connected-apps:org",
+        "diagnose:unused-connected-apps:hardis:org",
+        "diagnose:unused-connected-apps:org:hardis",
+        "hardis:org:unused-connected-apps:diagnose",
+        "org:hardis:unused-connected-apps:diagnose",
+        "org:unused-connected-apps:hardis:diagnose",
+        "org:unused-connected-apps:diagnose:hardis",
+        "hardis:unused-connected-apps:org:diagnose",
+        "unused-connected-apps:hardis:org:diagnose",
+        "unused-connected-apps:org:hardis:diagnose",
+        "unused-connected-apps:org:diagnose:hardis",
+        "hardis:unused-connected-apps:diagnose:org",
+        "unused-connected-apps:hardis:diagnose:org",
+        "unused-connected-apps:diagnose:hardis:org",
+        "unused-connected-apps:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:unsecure-connected-apps": {
+    "hardis:org:diagnose:unusedlicenses": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Detects unsecured Connected Apps in a Salesforce org and generates detailed reports for security analysis.**\n\nThis command is a critical security diagnostic tool that helps administrators identify Connected Apps that may pose security risks due to improper configuration. It provides comprehensive analysis of OAuth tokens and Connected App security settings to ensure proper access control.\n\nKey functionalities:\n\n- **OAuth Token Analysis:** Queries all OAuth tokens in the org using SOQL to retrieve comprehensive token information including app names, users, authorization status, and usage statistics.\n- **Security Status Assessment:** Evaluates each Connected App's security configuration by checking the `IsUsingAdminAuthorization` flag to determine if admin pre-approval is required.\n- **Unsecured App Detection:** Identifies Connected Apps that allow users to authorize themselves without admin approval, which can pose security risks.\n- **Detailed Reporting:** Generates two comprehensive CSV reports:\n  - **OAuth Tokens Report:** Lists all OAuth tokens with security status, user information, and usage data\n  - **Connected Apps Summary:** Aggregates unsecured Connected Apps with counts of associated OAuth tokens\n- **Visual Indicators:** Uses status icons (❌ for unsecured, ✅ for secured) to provide immediate visual feedback on security status.\n- **Security Recommendations:** Provides actionable guidance on how to secure Connected Apps through proper configuration.\n- **Notifications:** Sends alerts to configured channels (Grafana, Slack, MS Teams) with security findings and attached reports.\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-org-security/) and can output Grafana, Slack and MsTeams Notifications.\n\n<iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/jHv8yrSK8Dg\" 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 involves:\n\n- **SOQL Query Execution:** Executes a comprehensive SOQL query on the `OauthToken` object, joining with `AppMenuItem` and `User` objects to gather complete security context.\n- **Security Analysis Logic:** Analyzes the `AppMenuItem.IsUsingAdminAuthorization` field to determine if a Connected App requires admin pre-approval for user authorization.\n- **Data Transformation:** Processes raw SOQL results to add security status indicators and reorganize data for optimal reporting and analysis.\n- **Aggregation Processing:** Groups OAuth tokens by Connected App name to provide summary statistics and identify the most problematic applications.\n- **Report Generation:** Uses `generateCsvFile` to create structured CSV reports with proper formatting and metadata for easy analysis and sharing.\n- **Notification Integration:** Integrates with the `NotifProvider` to send security alerts with detailed metrics, including the number of unsecured Connected Apps and associated OAuth tokens.\n- **File Management:** Generates multiple output formats (CSV, XLSX) and manages file paths using `generateReportPath` for consistent report organization.\n- **Connection Management:** Uses `setConnectionVariables` to ensure proper authentication context for notification providers that require org connection details.\n</details>\n",
+      "description": "\n## Command Behavior\n\n**Detects and suggests the deletion of unused Permission Set License Assignments in a Salesforce org.**\n\nWhen a Permission Set (PS) linked to a Permission Set License (PSL) is assigned to a user, a Permission Set License Assignment (PSLA) is automatically created. However, when that PS is unassigned from the user, the PSLA is *not* automatically deleted. This can lead to organizations being charged for unused PSLAs, representing a hidden cost and technical debt.\n\nThis command identifies such useless PSLAs and provides options to delete them, helping to optimize license usage and reduce unnecessary expenses.\n\nKey functionalities:\n\n- **PSLA Detection:** Queries the Salesforce org to find all active PSLAs.\n- **Usage Verification:** Correlates PSLAs with actual Permission Set Assignments and Permission Set Group Assignments to determine if the underlying Permission Sets are still assigned to the user.\n- **Special Case Handling:** Accounts for specific scenarios where profiles might implicitly assign PSLAs (e.g., `Salesforce API Only` profile assigning `SalesforceAPIIntegrationPsl`) and allows for always excluding certain PSLAs from the unused check.\n- **Reporting:** Generates a CSV report of all identified unused PSLAs, including the user and the associated Permission Set License.\n- **Notifications:** Sends notifications to configured channels (Grafana, Slack, MS Teams) with a summary of unused PSLAs.\n- **Interactive Deletion:** In non-CI environments, it offers an interactive prompt to bulk delete the identified unused PSLAs.\n\nMany thanks to [Vincent Finet](https://www.linkedin.com/in/vincentfinet/) for the inspiration during his great speaker session at [French Touch Dreamin '23](https://frenchtouchdreamin.com/), and his kind agreement for reusing such inspiration in this command 😊\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-unused-licenses/) and can output Grafana, Slack and MsTeams Notifications.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves extensive querying of Salesforce objects and data correlation:\n\n- **SOQL Queries (Bulk API):** It uses `bulkQuery` and `bulkQueryChunksIn` to efficiently retrieve large volumes of data from `PermissionSetLicenseAssign`, `PermissionSetLicense`, `PermissionSet`, `PermissionSetGroupComponent`, and `PermissionSetAssignment` objects.\n- **Data Correlation:** It meticulously correlates data across these objects to determine if a `PermissionSetLicenseAssign` record has a corresponding active assignment to a Permission Set or Permission Set Group for the same user.\n- **Filtering Logic:** It applies complex filtering logic to exclude PSLAs that are genuinely in use or are part of predefined exceptions (e.g., `alwaysExcludeForActiveUsersPermissionSetLicenses`).\n- **Bulk Deletion:** If the user opts to delete unused PSLAs, it uses `bulkUpdate` with the `delete` operation to efficiently remove multiple records.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of unused PSLAs.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **User Interaction:** Uses `prompts` for interactive confirmation before performing deletion operations.\n</details>\n",
       "examples": [
-        "$ sf hardis:org:diagnose:unsecure-connected-apps"
+        "$ sf hardis:org:diagnose:unusedlicenses",
+        "$ sf hardis:org:diagnose:unusedlicenses --fix"
       ],
       "flags": {
         "json": {
@@ -6736,14 +6721,32 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:unsecure-connected-apps",
+      "id": "hardis:org:diagnose:unusedlicenses",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Detect Unsecured Connected Apps",
+      "title": "Detect unused Permission Set Licenses (beta)",
       "requiresProject": false,
+      "additionalPermissionSetsToAlwaysGet": [
+        "Sales_User"
+      ],
+      "permSetsPermSetLicenses": [
+        {
+          "permSet": "Sales_User",
+          "permSetLicense": "SalesUserPsl"
+        }
+      ],
+      "profilesPermissionSetLicenses": [
+        {
+          "profile": "Salesforce API Only",
+          "permSetLicense": "SalesforceAPIIntegrationPsl"
+        }
+      ],
+      "alwaysExcludeForActiveUsersPermissionSetLicenses": [
+        "IdentityConnect"
+      ],
       "isESM": true,
       "relativePath": [
         "lib",
@@ -6751,43 +6754,46 @@
         "hardis",
         "org",
         "diagnose",
-        "unsecure-connected-apps.js"
+        "unusedlicenses.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:unsecure-connected-apps",
-        "org:hardis:diagnose:unsecure-connected-apps",
-        "org:diagnose:hardis:unsecure-connected-apps",
-        "org:diagnose:unsecure-connected-apps:hardis",
-        "hardis:diagnose:org:unsecure-connected-apps",
-        "diagnose:hardis:org:unsecure-connected-apps",
-        "diagnose:org:hardis:unsecure-connected-apps",
-        "diagnose:org:unsecure-connected-apps:hardis",
-        "hardis:diagnose:unsecure-connected-apps:org",
-        "diagnose:hardis:unsecure-connected-apps:org",
-        "diagnose:unsecure-connected-apps:hardis:org",
-        "diagnose:unsecure-connected-apps:org:hardis",
-        "hardis:org:unsecure-connected-apps:diagnose",
-        "org:hardis:unsecure-connected-apps:diagnose",
-        "org:unsecure-connected-apps:hardis:diagnose",
-        "org:unsecure-connected-apps:diagnose:hardis",
-        "hardis:unsecure-connected-apps:org:diagnose",
-        "unsecure-connected-apps:hardis:org:diagnose",
-        "unsecure-connected-apps:org:hardis:diagnose",
-        "unsecure-connected-apps:org:diagnose:hardis",
-        "hardis:unsecure-connected-apps:diagnose:org",
-        "unsecure-connected-apps:hardis:diagnose:org",
-        "unsecure-connected-apps:diagnose:hardis:org",
-        "unsecure-connected-apps:diagnose:org:hardis"
+        "hardis:org:diagnose:unusedlicenses",
+        "org:hardis:diagnose:unusedlicenses",
+        "org:diagnose:hardis:unusedlicenses",
+        "org:diagnose:unusedlicenses:hardis",
+        "hardis:diagnose:org:unusedlicenses",
+        "diagnose:hardis:org:unusedlicenses",
+        "diagnose:org:hardis:unusedlicenses",
+        "diagnose:org:unusedlicenses:hardis",
+        "hardis:diagnose:unusedlicenses:org",
+        "diagnose:hardis:unusedlicenses:org",
+        "diagnose:unusedlicenses:hardis:org",
+        "diagnose:unusedlicenses:org:hardis",
+        "hardis:org:unusedlicenses:diagnose",
+        "org:hardis:unusedlicenses:diagnose",
+        "org:unusedlicenses:hardis:diagnose",
+        "org:unusedlicenses:diagnose:hardis",
+        "hardis:unusedlicenses:org:diagnose",
+        "unusedlicenses:hardis:org:diagnose",
+        "unusedlicenses:org:hardis:diagnose",
+        "unusedlicenses:org:diagnose:hardis",
+        "hardis:unusedlicenses:diagnose:org",
+        "unusedlicenses:hardis:diagnose:org",
+        "unusedlicenses:diagnose:hardis:org",
+        "unusedlicenses:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:unused-apex-classes": {
+    "hardis:org:diagnose:unusedusers": {
       "aliases": [],
       "args": {},
-      "description": "List all async Apex classes (Batch,Queueable,Schedulable) that has not been called for more than 365 days.\n  \nThe result class list probably can be removed from the project, and that will improve your test classes performances 😊\n\nThe number of unused day is overridable using --days option. \n\nThe command uses queries on AsyncApexJob and CronTrigger technical tables to build the result.\n\nApex Classes CreatedBy and CreatedOn fields are calculated from MIN(date from git, date from org)\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-unused-apex-classes/) and can output Grafana, Slack and MsTeams Notifications.\n\n![](https://sfdx-hardis.cloudity.com/assets/images/screenshot-monitoring-unused-apex-grafana.jpg)\n",
+      "description": "\n## Command Behavior\n\n**Detects and reports on inactive or unused Salesforce user accounts, helping to optimize license usage and enhance security.**\n\nEfficient user management is vital in Salesforce to ensure resources are optimized and costs are controlled. However, inactive or unused user accounts can often go unnoticed, leading to wasted licenses and potential security risks. This tool addresses this challenge by enabling administrators to identify users who haven't logged in within a specified period.\n\nBy analyzing user login activity and last login timestamps, this feature highlights inactive user accounts, allowing administrators to take appropriate action. Whether it's deactivating dormant accounts, freeing up licenses, or ensuring compliance with security policies, this functionality empowers administrators to maintain a lean and secure Salesforce environment.\n\nKey functionalities:\n\n- **Inactivity Detection:** Identifies users who have not logged in for a specified number of days (`--days` flag, default 180 days in CI, 365 days otherwise).\n- **License Type Filtering:** Allows filtering users by license type using `--licensetypes` (e.g., `all-crm`, `all-paying`) or specific license identifiers using `--licenseidentifiers`.\n  - `all-crm`: Includes `SFDC`, `AUL`, `AUL1`, `AULL_IGHT` licenses.\n  - `all-paying`: Includes `SFDC`, `AUL`, `AUL1`, `AULL_IGHT`, `PID_Customer_Community`, `PID_Customer_Community_Login`, `PID_Partner_Community`, `PID_Partner_Community_Login` licenses.\n  - Note: You can see the full list of available license identifiers in [Salesforce Documentation](https://developer.salesforce.com/docs/atlas.en-us.object_reference.meta/sfdx_cli_reference/sforce_api_objects_userlicense.htm).\n- **Active User Retrieval:** The `--returnactiveusers` flag inverts the command, allowing you to retrieve active users who *have* logged in during the specified period.\n- **CSV Report Generation:** Generates a CSV file containing details of all identified users (inactive or active), including their last login date, profile, and license information.\n- **Notifications:** Sends notifications to configured channels (Grafana, Slack, MS Teams) with a summary of inactive or active users.\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-inactive-users/) and can output Grafana, Slack and MsTeams Notifications.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **SOQL Query (Bulk API):** It uses `bulkQuery` to efficiently retrieve user records from the Salesforce `User` object. The SOQL query dynamically constructs its WHERE clause based on the `--days`, `--licensetypes`, `--licenseidentifiers`, and `--returnactiveusers` flags.\n- **Interactive Prompts:** Uses `prompts` to interactively ask the user for the number of inactive days and license types if not provided via flags.\n- **License Mapping:** Internally maps common license type aliases (e.g., `all-crm`) to their corresponding Salesforce `LicenseDefinitionKey` values.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of users.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **User Feedback:** Provides a summary of the findings in the console, indicating the number of inactive or active users found.\n</details>",
       "examples": [
-        "$ sf hardis:org:diagnose:unused-apex-classes",
-        "$ sf hardis:org:diagnose:unused-apex-classes --days 700"
+        "$ sf hardis:org:diagnose:unusedusers",
+        "$ sf hardis:org:diagnose:unusedusers --days 365",
+        "$ sf hardis:org:diagnose:unusedusers --days 60 --licensetypes all-crm",
+        "$ sf hardis:org:diagnose:unusedusers --days 60 --licenseidentifiers SFDC,AUL,AUL1",
+        "$ sf hardis:org:diagnose:unusedusers --days 60 --licensetypes all-crm --returnactiveusers"
       ],
       "flags": {
         "json": {
@@ -6821,6 +6827,33 @@
           "multiple": false,
           "type": "option"
         },
+        "licensetypes": {
+          "char": "l",
+          "description": "Type of licenses to check. If set, do not use licenseidentifiers option. In CI, default is all-crm",
+          "name": "licensetypes",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "all",
+            "all-crm",
+            "all-paying"
+          ],
+          "type": "option"
+        },
+        "licenseidentifiers": {
+          "char": "i",
+          "description": "Comma-separated list of license identifiers, in case licensetypes is not used.. Identifiers available at https://developer.salesforce.com/docs/atlas.en-us.object_reference.meta/object_reference/sforce_api_objects_userlicense.htm",
+          "name": "licenseidentifiers",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "returnactiveusers": {
+          "description": "Inverts the command by returning the active users",
+          "name": "returnactiveusers",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -6859,13 +6892,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:unused-apex-classes",
+      "id": "hardis:org:diagnose:unusedusers",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Detect unused Apex classes in an org",
+      "title": "Detect unused Users in Salesforce",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -6874,42 +6907,42 @@
         "hardis",
         "org",
         "diagnose",
-        "unused-apex-classes.js"
+        "unusedusers.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:unused-apex-classes",
-        "org:hardis:diagnose:unused-apex-classes",
-        "org:diagnose:hardis:unused-apex-classes",
-        "org:diagnose:unused-apex-classes:hardis",
-        "hardis:diagnose:org:unused-apex-classes",
-        "diagnose:hardis:org:unused-apex-classes",
-        "diagnose:org:hardis:unused-apex-classes",
-        "diagnose:org:unused-apex-classes:hardis",
-        "hardis:diagnose:unused-apex-classes:org",
-        "diagnose:hardis:unused-apex-classes:org",
-        "diagnose:unused-apex-classes:hardis:org",
-        "diagnose:unused-apex-classes:org:hardis",
-        "hardis:org:unused-apex-classes:diagnose",
-        "org:hardis:unused-apex-classes:diagnose",
-        "org:unused-apex-classes:hardis:diagnose",
-        "org:unused-apex-classes:diagnose:hardis",
-        "hardis:unused-apex-classes:org:diagnose",
-        "unused-apex-classes:hardis:org:diagnose",
-        "unused-apex-classes:org:hardis:diagnose",
-        "unused-apex-classes:org:diagnose:hardis",
-        "hardis:unused-apex-classes:diagnose:org",
-        "unused-apex-classes:hardis:diagnose:org",
-        "unused-apex-classes:diagnose:hardis:org",
-        "unused-apex-classes:diagnose:org:hardis"
+        "hardis:org:diagnose:unusedusers",
+        "org:hardis:diagnose:unusedusers",
+        "org:diagnose:hardis:unusedusers",
+        "org:diagnose:unusedusers:hardis",
+        "hardis:diagnose:org:unusedusers",
+        "diagnose:hardis:org:unusedusers",
+        "diagnose:org:hardis:unusedusers",
+        "diagnose:org:unusedusers:hardis",
+        "hardis:diagnose:unusedusers:org",
+        "diagnose:hardis:unusedusers:org",
+        "diagnose:unusedusers:hardis:org",
+        "diagnose:unusedusers:org:hardis",
+        "hardis:org:unusedusers:diagnose",
+        "org:hardis:unusedusers:diagnose",
+        "org:unusedusers:hardis:diagnose",
+        "org:unusedusers:diagnose:hardis",
+        "hardis:unusedusers:org:diagnose",
+        "unusedusers:hardis:org:diagnose",
+        "unusedusers:org:hardis:diagnose",
+        "unusedusers:org:diagnose:hardis",
+        "hardis:unusedusers:diagnose:org",
+        "unusedusers:hardis:diagnose:org",
+        "unusedusers:diagnose:hardis:org",
+        "unusedusers:diagnose:org:hardis"
       ]
     },
-    "hardis:org:diagnose:unused-connected-apps": {
+    "hardis:org:files:export": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Identifies and reports on potentially unused Connected Apps in a Salesforce org, suggesting candidates for deletion or deactivation.**\n\nThis command helps improve org security and reduce technical debt by pinpointing Connected Apps that are no longer actively used. Connected Apps can pose security risks if left unmonitored, and cleaning them up contributes to a healthier Salesforce environment.\n\nKey functionalities:\n\n- **Connected App Data Collection:** Gathers information about all Connected Apps in the org, including creation and last modified dates, and associated users.\n- **Usage Analysis:** Analyzes `LoginHistory` and `OAuthToken` records to determine the last usage date of each Connected App.\n- **Inactivity Detection:** Flags Connected Apps as potentially unused if they have no recent login history or OAuth token usage.\n- **Accessibility Check:** Examines Connected App metadata to identify if they are accessible (e.g., if they require admin approval and have no profiles or permission sets assigned).\n- **Ignored Apps:** Automatically ignores a predefined list of common Salesforce Connected Apps (e.g., `Salesforce CLI`, `Salesforce Mobile Dashboards`). You can extend this list by defining the `ALLOWED_INACTIVE_CONNECTED_APPS` environment variable.\n- **CSV Report Generation:** Generates a CSV file containing details of all analyzed Connected Apps, including their usage status, last usage date, and reasons for being flagged as potentially unused.\n- **Notifications:** Sends notifications to configured channels (Grafana, Slack, MS Teams) with a summary of potentially unused Connected Apps.\n\n**Default Ignored Connected Apps:**\n\n- Ant Migration Tool\n- Chatter Desktop\n- Chatter Mobile for BlackBerry\n- Force.com IDE\n- OIQ_Integration\n- Salesforce CLI\n- Salesforce Files\n- Salesforce Mobile Dashboards\n- Salesforce Touch\n- Salesforce for Outlook\n- SalesforceA\n- SalesforceA for Android\n- SalesforceA for iOS\n- SalesforceDX Namespace Registry\n- SalesforceIQ\n\nYou can add more ignored apps by defining a comma-separated list of names in the `ALLOWED_INACTIVE_CONNECTED_APPS` environment variable.\n\n_Example: \nALLOWED_INACTIVE_CONNECTED_APPS=My App 1,My App 2, My App 3_\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-unused-connected-apps/) and can output Grafana, Slack and MsTeams Notifications.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **Salesforce SOQL Queries:** It performs SOQL queries against `ConnectedApplication`, `LoginHistory`, and `OAuthToken` objects to gather comprehensive data about Connected Apps and their usage.\n- **Temporary SFDX Project:** It creates a temporary SFDX project to retrieve Connected App metadata, allowing for local parsing and analysis of their XML files.\n- **Metadata Parsing:** It parses the `connectedApp-meta.xml` files to check for `isAdminApproved` and the presence of `profileName` or `permissionsetName` to determine accessibility.\n- **Data Correlation:** It correlates data from various Salesforce objects to build a complete picture of each Connected App's usage and status.\n- **Date Calculation:** Uses `moment` to calculate the time since the last OAuth token usage.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of unused Connected Apps.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **File System Operations:** Uses `fs-extra` for creating and removing temporary directories and files.\n- **Environment Variable Reading:** Reads the `ALLOWED_INACTIVE_CONNECTED_APPS` environment variable to customize the list of ignored Connected Apps.\n</details>\n",
+      "description": "\n## Command Behavior\n\n**Exports file attachments (ContentVersion, Attachment) from a Salesforce org based on a predefined configuration.**\n\nThis command enables the mass download of files associated with Salesforce records, providing a robust solution for backing up files, migrating them to other systems, or integrating them with external document management solutions.\n\nKey functionalities:\n\n- **Configuration-Driven Export:** Relies on an `export.json` file within a designated file export project to define the export criteria, including the SOQL query for parent records, file types to export, output naming conventions, and file size filtering.\n- **File Size Filtering:** Supports minimum file size filtering via the `fileSizeMin` configuration parameter (in KB). Files smaller than the specified size will be skipped during export.\n- **File Validation:** After downloading each file, validates the integrity by:\n  - **Checksum Validation:** For ContentVersion files, compares MD5 checksum with Salesforce's stored checksum\n  - **Size Validation:** For both ContentVersion and Attachment files, verifies actual file size matches expected size\n  - **Status Tracking:** Files are categorized with specific statuses: `success` (valid files), `failed` (download errors), `skipped` (filtered files), `invalid` (downloaded but failed validation)\n  - All validation results are logged in the CSV export log for audit purposes\n- **Resume/Restart Capability:** \n  - **Resume Mode:** When `--resume` flag is used (default in CI environments), checks existing downloaded files for validity. Valid files are skipped, invalid files are re-downloaded.\n  - **Restart Mode:** When resume is disabled, clears the output folder and starts a fresh export.\n  - **Interactive Mode:** When existing files are found and `--resume` is not explicitly specified (non-CI environments), prompts the user to choose between resume or restart.\n- **Interactive Project Selection:** If the file export project path is not provided via the `--path` flag, it interactively prompts the user to select one.\n- **Configurable Export Options:** Allows overriding default export settings such as `chunksize` (number of records processed in a batch), `polltimeout` (timeout for Bulk API calls), and `startchunknumber` (to resume a failed export).\n- **Support for ContentVersion and Attachment:** Handles both modern Salesforce Files (ContentVersion) and older Attachments.\n\nSee this article for a practical example:\n\n[![How to mass download notes and attachments files from a Salesforce org](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-mass-download.jpg)](https://nicolas.vuillamy.fr/how-to-mass-download-notes-and-attachments-files-from-a-salesforce-org-83a028824afd)\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **FilesExporter Class:** The core logic is encapsulated within the `FilesExporter` class, which orchestrates the entire export process.\n- **SOQL Queries (Bulk API):** It uses Salesforce Bulk API queries to efficiently retrieve large volumes of parent record IDs and file metadata, including checksums and file sizes.\n- **File Download:** Downloads the actual file content from Salesforce.\n- **File Validation:** After each successful download, validates file integrity by comparing checksums (ContentVersion) and file sizes (both ContentVersion and Attachment) against Salesforce metadata.\n- **Resume Logic:** In resume mode, checks for existing files before downloading, validates their integrity, and only re-downloads invalid or missing files. This enables efficient recovery from interrupted exports.\n- **File System Operations:** Writes the downloaded files to the local file system, organizing them into folders based on the configured naming conventions.\n- **Configuration Loading:** Reads the `export.json` file to get the export configuration. It also allows for interactive overriding of these settings.\n- **Interactive Prompts:** Uses `selectFilesWorkspace` to allow the user to choose a file export project, `promptFilesExportConfiguration` for customizing export options, and prompts for resume/restart choice when existing files are found.\n- **Error Handling:** Includes mechanisms to handle potential errors during the export process, such as network issues, API limits, and file validation failures. Each file is assigned a specific status (`success`, `failed`, `skipped`, `invalid`) for comprehensive tracking and troubleshooting.\n</details>\n",
       "examples": [
-        "$ sf hardis:org:diagnose:unused-connected-apps"
+        "$ sf hardis:org:files:export"
       ],
       "flags": {
         "json": {
@@ -6927,14 +6960,48 @@
           "multiple": false,
           "type": "option"
         },
-        "outputfile": {
-          "char": "f",
-          "description": "Force the path and name of output report file. Must end with .csv",
-          "name": "outputfile",
+        "path": {
+          "char": "p",
+          "description": "Path to the file export project",
+          "name": "path",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "chunksize": {
+          "char": "c",
+          "description": "Number of records to add in a chunk before it is processed",
+          "name": "chunksize",
+          "default": 1000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "polltimeout": {
+          "char": "t",
+          "description": "Timeout in MS for Bulk API calls",
+          "name": "polltimeout",
+          "default": 300000,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "startchunknumber": {
+          "char": "s",
+          "description": "Chunk number to start from",
+          "name": "startchunknumber",
+          "default": 0,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "resume": {
+          "char": "r",
+          "description": "Resume previous export by checking existing files (default in CI)",
+          "name": "resume",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -6973,30 +7040,13 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:unused-connected-apps",
+      "id": "hardis:org:files:export",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Unused Connected Apps in an org",
-      "allowedInactiveConnectedApps": [
-        "Ant Migration Tool",
-        "Chatter Desktop",
-        "Chatter Mobile for BlackBerry",
-        "Force.com IDE",
-        "OIQ_Integration",
-        "Salesforce CLI",
-        "Salesforce Files",
-        "Salesforce Mobile Dashboards",
-        "Salesforce Touch",
-        "Salesforce for Outlook",
-        "SalesforceA",
-        "SalesforceA for Android",
-        "SalesforceA for iOS",
-        "SalesforceDX Namespace Registry",
-        "SalesforceIQ"
-      ],
+      "title": "Export files",
       "requiresProject": false,
       "isESM": true,
       "relativePath": [
@@ -7004,44 +7054,43 @@
         "commands",
         "hardis",
         "org",
-        "diagnose",
-        "unused-connected-apps.js"
+        "files",
+        "export.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:unused-connected-apps",
-        "org:hardis:diagnose:unused-connected-apps",
-        "org:diagnose:hardis:unused-connected-apps",
-        "org:diagnose:unused-connected-apps:hardis",
-        "hardis:diagnose:org:unused-connected-apps",
-        "diagnose:hardis:org:unused-connected-apps",
-        "diagnose:org:hardis:unused-connected-apps",
-        "diagnose:org:unused-connected-apps:hardis",
-        "hardis:diagnose:unused-connected-apps:org",
-        "diagnose:hardis:unused-connected-apps:org",
-        "diagnose:unused-connected-apps:hardis:org",
-        "diagnose:unused-connected-apps:org:hardis",
-        "hardis:org:unused-connected-apps:diagnose",
-        "org:hardis:unused-connected-apps:diagnose",
-        "org:unused-connected-apps:hardis:diagnose",
-        "org:unused-connected-apps:diagnose:hardis",
-        "hardis:unused-connected-apps:org:diagnose",
-        "unused-connected-apps:hardis:org:diagnose",
-        "unused-connected-apps:org:hardis:diagnose",
-        "unused-connected-apps:org:diagnose:hardis",
-        "hardis:unused-connected-apps:diagnose:org",
-        "unused-connected-apps:hardis:diagnose:org",
-        "unused-connected-apps:diagnose:hardis:org",
-        "unused-connected-apps:diagnose:org:hardis"
+        "hardis:org:files:export",
+        "org:hardis:files:export",
+        "org:files:hardis:export",
+        "org:files:export:hardis",
+        "hardis:files:org:export",
+        "files:hardis:org:export",
+        "files:org:hardis:export",
+        "files:org:export:hardis",
+        "hardis:files:export:org",
+        "files:hardis:export:org",
+        "files:export:hardis:org",
+        "files:export:org:hardis",
+        "hardis:org:export:files",
+        "org:hardis:export:files",
+        "org:export:hardis:files",
+        "org:export:files:hardis",
+        "hardis:export:org:files",
+        "export:hardis:org:files",
+        "export:org:hardis:files",
+        "export:org:files:hardis",
+        "hardis:export:files:org",
+        "export:hardis:files:org",
+        "export:files:hardis:org",
+        "export:files:org:hardis"
       ]
     },
-    "hardis:org:diagnose:unusedlicenses": {
+    "hardis:org:files:import": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Detects and suggests the deletion of unused Permission Set License Assignments in a Salesforce org.**\n\nWhen a Permission Set (PS) linked to a Permission Set License (PSL) is assigned to a user, a Permission Set License Assignment (PSLA) is automatically created. However, when that PS is unassigned from the user, the PSLA is *not* automatically deleted. This can lead to organizations being charged for unused PSLAs, representing a hidden cost and technical debt.\n\nThis command identifies such useless PSLAs and provides options to delete them, helping to optimize license usage and reduce unnecessary expenses.\n\nKey functionalities:\n\n- **PSLA Detection:** Queries the Salesforce org to find all active PSLAs.\n- **Usage Verification:** Correlates PSLAs with actual Permission Set Assignments and Permission Set Group Assignments to determine if the underlying Permission Sets are still assigned to the user.\n- **Special Case Handling:** Accounts for specific scenarios where profiles might implicitly assign PSLAs (e.g., `Salesforce API Only` profile assigning `SalesforceAPIIntegrationPsl`) and allows for always excluding certain PSLAs from the unused check.\n- **Reporting:** Generates a CSV report of all identified unused PSLAs, including the user and the associated Permission Set License.\n- **Notifications:** Sends notifications to configured channels (Grafana, Slack, MS Teams) with a summary of unused PSLAs.\n- **Interactive Deletion:** In non-CI environments, it offers an interactive prompt to bulk delete the identified unused PSLAs.\n\nMany thanks to [Vincent Finet](https://www.linkedin.com/in/vincentfinet/) for the inspiration during his great speaker session at [French Touch Dreamin '23](https://frenchtouchdreamin.com/), and his kind agreement for reusing such inspiration in this command 😊\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-unused-licenses/) and can output Grafana, Slack and MsTeams Notifications.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves extensive querying of Salesforce objects and data correlation:\n\n- **SOQL Queries (Bulk API):** It uses `bulkQuery` and `bulkQueryChunksIn` to efficiently retrieve large volumes of data from `PermissionSetLicenseAssign`, `PermissionSetLicense`, `PermissionSet`, `PermissionSetGroupComponent`, and `PermissionSetAssignment` objects.\n- **Data Correlation:** It meticulously correlates data across these objects to determine if a `PermissionSetLicenseAssign` record has a corresponding active assignment to a Permission Set or Permission Set Group for the same user.\n- **Filtering Logic:** It applies complex filtering logic to exclude PSLAs that are genuinely in use or are part of predefined exceptions (e.g., `alwaysExcludeForActiveUsersPermissionSetLicenses`).\n- **Bulk Deletion:** If the user opts to delete unused PSLAs, it uses `bulkUpdate` with the `delete` operation to efficiently remove multiple records.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of unused PSLAs.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **User Interaction:** Uses `prompts` for interactive confirmation before performing deletion operations.\n</details>\n",
+      "description": "\nThis command facilitates the mass upload of files into Salesforce, allowing you to populate records with associated documents, images, or other file types. It's a crucial tool for data migration, content seeding, or synchronizing external file repositories with Salesforce.\n\nKey functionalities:\n\n- **Configuration-Driven Import:** Relies on an `export.json` file within a designated file export project (created using `sf hardis:org:configure:files`) to determine which files to import and how they should be associated with Salesforce records.\n- **Interactive Project Selection:** If the file import project path is not provided via the `--path` flag, it interactively prompts the user to select one.\n- **Overwrite Option:** The `--overwrite` flag allows you to replace existing files in Salesforce with local versions that have the same name. Be aware that this option doubles the number of API calls used.\n- **Support for ContentVersion and Attachment:** Handles both modern Salesforce Files (ContentVersion) and older Attachments.\n\nSee this article for how to export files, which is often a prerequisite for importing:\n\n[![How to mass download notes and attachments files from a Salesforce org](https://github.com/hardisgroupcom/sfdx-hardis/raw/main/docs/assets/images/article-mass-download.jpg)](https://nicolas.vuillamy.fr/how-to-mass-download-notes-and-attachments-files-from-a-salesforce-org-83a028824afd)\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **FilesImporter Class:** The core logic is encapsulated within the `FilesImporter` class, which orchestrates the entire import process.\n- **File System Scan:** Scans the local file system within the configured project directory to identify files for import.\n- **Salesforce API Interaction:** Uses Salesforce APIs (e.g., ContentVersion, Attachment) to upload files and associate them with records.\n- **Configuration Loading:** Reads the `export.json` file to get the import configuration, including SOQL queries to identify parent records for file association.\n- **Interactive Prompts:** Uses `selectFilesWorkspace` to allow the user to choose a file import project and `prompts` for confirming the overwrite behavior.\n- **Error Handling:** Includes mechanisms to handle potential errors during the import process, such as API limits or file upload failures.\n</details>\n",
       "examples": [
-        "$ sf hardis:org:diagnose:unusedlicenses",
-        "$ sf hardis:org:diagnose:unusedlicenses --fix"
+        "$ sf hardis:org:files:import"
       ],
       "flags": {
         "json": {
@@ -7059,14 +7108,21 @@
           "multiple": false,
           "type": "option"
         },
-        "outputfile": {
-          "char": "f",
-          "description": "Force the path and name of output report file. Must end with .csv",
-          "name": "outputfile",
+        "path": {
+          "char": "p",
+          "description": "Path to the file export project",
+          "name": "path",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "overwrite": {
+          "char": "f",
+          "description": "Override existing files (doubles the number of API calls)",
+          "name": "overwrite",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -7105,79 +7161,58 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:unusedlicenses",
+      "id": "hardis:org:files:import",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Detect unused Permission Set Licenses (beta)",
+      "title": "Import files",
       "requiresProject": false,
-      "additionalPermissionSetsToAlwaysGet": [
-        "Sales_User"
-      ],
-      "permSetsPermSetLicenses": [
-        {
-          "permSet": "Sales_User",
-          "permSetLicense": "SalesUserPsl"
-        }
-      ],
-      "profilesPermissionSetLicenses": [
-        {
-          "profile": "Salesforce API Only",
-          "permSetLicense": "SalesforceAPIIntegrationPsl"
-        }
-      ],
-      "alwaysExcludeForActiveUsersPermissionSetLicenses": [
-        "IdentityConnect"
-      ],
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
         "org",
-        "diagnose",
-        "unusedlicenses.js"
+        "files",
+        "import.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:unusedlicenses",
-        "org:hardis:diagnose:unusedlicenses",
-        "org:diagnose:hardis:unusedlicenses",
-        "org:diagnose:unusedlicenses:hardis",
-        "hardis:diagnose:org:unusedlicenses",
-        "diagnose:hardis:org:unusedlicenses",
-        "diagnose:org:hardis:unusedlicenses",
-        "diagnose:org:unusedlicenses:hardis",
-        "hardis:diagnose:unusedlicenses:org",
-        "diagnose:hardis:unusedlicenses:org",
-        "diagnose:unusedlicenses:hardis:org",
-        "diagnose:unusedlicenses:org:hardis",
-        "hardis:org:unusedlicenses:diagnose",
-        "org:hardis:unusedlicenses:diagnose",
-        "org:unusedlicenses:hardis:diagnose",
-        "org:unusedlicenses:diagnose:hardis",
-        "hardis:unusedlicenses:org:diagnose",
-        "unusedlicenses:hardis:org:diagnose",
-        "unusedlicenses:org:hardis:diagnose",
-        "unusedlicenses:org:diagnose:hardis",
-        "hardis:unusedlicenses:diagnose:org",
-        "unusedlicenses:hardis:diagnose:org",
-        "unusedlicenses:diagnose:hardis:org",
-        "unusedlicenses:diagnose:org:hardis"
+        "hardis:org:files:import",
+        "org:hardis:files:import",
+        "org:files:hardis:import",
+        "org:files:import:hardis",
+        "hardis:files:org:import",
+        "files:hardis:org:import",
+        "files:org:hardis:import",
+        "files:org:import:hardis",
+        "hardis:files:import:org",
+        "files:hardis:import:org",
+        "files:import:hardis:org",
+        "files:import:org:hardis",
+        "hardis:org:import:files",
+        "org:hardis:import:files",
+        "org:import:hardis:files",
+        "org:import:files:hardis",
+        "hardis:import:org:files",
+        "import:hardis:org:files",
+        "import:org:hardis:files",
+        "import:org:files:hardis",
+        "hardis:import:files:org",
+        "import:hardis:files:org",
+        "import:files:hardis:org",
+        "import:files:org:hardis"
       ]
     },
-    "hardis:org:diagnose:unusedusers": {
+    "hardis:org:fix:listviewmine": {
       "aliases": [],
       "args": {},
-      "description": "\n## Command Behavior\n\n**Detects and reports on inactive or unused Salesforce user accounts, helping to optimize license usage and enhance security.**\n\nEfficient user management is vital in Salesforce to ensure resources are optimized and costs are controlled. However, inactive or unused user accounts can often go unnoticed, leading to wasted licenses and potential security risks. This tool addresses this challenge by enabling administrators to identify users who haven't logged in within a specified period.\n\nBy analyzing user login activity and last login timestamps, this feature highlights inactive user accounts, allowing administrators to take appropriate action. Whether it's deactivating dormant accounts, freeing up licenses, or ensuring compliance with security policies, this functionality empowers administrators to maintain a lean and secure Salesforce environment.\n\nKey functionalities:\n\n- **Inactivity Detection:** Identifies users who have not logged in for a specified number of days (`--days` flag, default 180 days in CI, 365 days otherwise).\n- **License Type Filtering:** Allows filtering users by license type using `--licensetypes` (e.g., `all-crm`, `all-paying`) or specific license identifiers using `--licenseidentifiers`.\n  - `all-crm`: Includes `SFDC`, `AUL`, `AUL1`, `AULL_IGHT` licenses.\n  - `all-paying`: Includes `SFDC`, `AUL`, `AUL1`, `AULL_IGHT`, `PID_Customer_Community`, `PID_Customer_Community_Login`, `PID_Partner_Community`, `PID_Partner_Community_Login` licenses.\n  - Note: You can see the full list of available license identifiers in [Salesforce Documentation](https://developer.salesforce.com/docs/atlas.en-us.object_reference.meta/sfdx_cli_reference/sforce_api_objects_userlicense.htm).\n- **Active User Retrieval:** The `--returnactiveusers` flag inverts the command, allowing you to retrieve active users who *have* logged in during the specified period.\n- **CSV Report Generation:** Generates a CSV file containing details of all identified users (inactive or active), including their last login date, profile, and license information.\n- **Notifications:** Sends notifications to configured channels (Grafana, Slack, MS Teams) with a summary of inactive or active users.\n\nThis command is part of [sfdx-hardis Monitoring](https://sfdx-hardis.cloudity.com/salesforce-monitoring-inactive-users/) and can output Grafana, Slack and MsTeams Notifications.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **SOQL Query (Bulk API):** It uses `bulkQuery` to efficiently retrieve user records from the Salesforce `User` object. The SOQL query dynamically constructs its WHERE clause based on the `--days`, `--licensetypes`, `--licenseidentifiers`, and `--returnactiveusers` flags.\n- **Interactive Prompts:** Uses `prompts` to interactively ask the user for the number of inactive days and license types if not provided via flags.\n- **License Mapping:** Internally maps common license type aliases (e.g., `all-crm`) to their corresponding Salesforce `LicenseDefinitionKey` values.\n- **Report Generation:** It uses `generateCsvFile` to create the CSV report of users.\n- **Notification Integration:** It integrates with the `NotifProvider` to send notifications, including attachments of the generated CSV report and metrics for monitoring dashboards.\n- **User Feedback:** Provides a summary of the findings in the console, indicating the number of inactive or active users found.\n</details>",
+      "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:diagnose:unusedusers",
-        "$ sf hardis:org:diagnose:unusedusers --days 365",
-        "$ sf hardis:org:diagnose:unusedusers --days 60 --licensetypes all-crm",
-        "$ sf hardis:org:diagnose:unusedusers --days 60 --licenseidentifiers SFDC,AUL,AUL1",
-        "$ sf hardis:org:diagnose:unusedusers --days 60 --licensetypes all-crm --returnactiveusers"
+        "$ sf hardis:org:fix:listviewmine",
+        "$ sf hardis:org:fix:listviewmine --listviews Opportunity:MySubscriptions,Account:MyActivePartners"
       ],
       "flags": {
         "json": {
@@ -7195,49 +7230,14 @@
           "multiple": false,
           "type": "option"
         },
-        "outputfile": {
-          "char": "f",
-          "description": "Force the path and name of output report file. Must end with .csv",
-          "name": "outputfile",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "days": {
-          "char": "t",
-          "description": "Extracts the users that have been inactive for the amount of days specified. In CI, default is 180 days",
-          "name": "days",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "licensetypes": {
+        "listviews": {
           "char": "l",
-          "description": "Type of licenses to check. If set, do not use licenseidentifiers option. In CI, default is all-crm",
-          "name": "licensetypes",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "all",
-            "all-crm",
-            "all-paying"
-          ],
-          "type": "option"
-        },
-        "licenseidentifiers": {
-          "char": "i",
-          "description": "Comma-separated list of license identifiers, in case licensetypes is not used.. Identifiers available at https://developer.salesforce.com/docs/atlas.en-us.object_reference.meta/object_reference/sforce_api_objects_userlicense.htm",
-          "name": "licenseidentifiers",
+          "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"
         },
-        "returnactiveusers": {
-          "description": "Inverts the command by returning the active users",
-          "name": "returnactiveusers",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "debug": {
           "char": "d",
           "description": "Activate debug mode (more logs)",
@@ -7276,49 +7276,49 @@
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "hardis:org:diagnose:unusedusers",
+      "id": "hardis:org:fix:listviewmine",
       "pluginAlias": "sfdx-hardis",
       "pluginName": "sfdx-hardis",
       "pluginType": "core",
       "strict": true,
       "enableJsonFlag": true,
-      "title": "Detect unused Users in Salesforce",
-      "requiresProject": false,
+      "title": "Fix listviews with ",
+      "requiresProject": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "hardis",
         "org",
-        "diagnose",
-        "unusedusers.js"
+        "fix",
+        "listviewmine.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:org:diagnose:unusedusers",
-        "org:hardis:diagnose:unusedusers",
-        "org:diagnose:hardis:unusedusers",
-        "org:diagnose:unusedusers:hardis",
-        "hardis:diagnose:org:unusedusers",
-        "diagnose:hardis:org:unusedusers",
-        "diagnose:org:hardis:unusedusers",
-        "diagnose:org:unusedusers:hardis",
-        "hardis:diagnose:unusedusers:org",
-        "diagnose:hardis:unusedusers:org",
-        "diagnose:unusedusers:hardis:org",
-        "diagnose:unusedusers:org:hardis",
-        "hardis:org:unusedusers:diagnose",
-        "org:hardis:unusedusers:diagnose",
-        "org:unusedusers:hardis:diagnose",
-        "org:unusedusers:diagnose:hardis",
-        "hardis:unusedusers:org:diagnose",
-        "unusedusers:hardis:org:diagnose",
-        "unusedusers:org:hardis:diagnose",
-        "unusedusers:org:diagnose:hardis",
-        "hardis:unusedusers:diagnose:org",
-        "unusedusers:hardis:diagnose:org",
-        "unusedusers:diagnose:hardis:org",
-        "unusedusers:diagnose:org:hardis"
+        "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": {
@@ -9913,262 +9913,30 @@
       ],
       "aliasPermutations": [],
       "permutations": [
-        "hardis:project:audit:remotesites",
-        "project:hardis:audit:remotesites",
-        "project:audit:hardis:remotesites",
-        "project:audit:remotesites:hardis",
-        "hardis:audit:project:remotesites",
-        "audit:hardis:project:remotesites",
-        "audit:project:hardis:remotesites",
-        "audit:project:remotesites:hardis",
-        "hardis:audit:remotesites:project",
-        "audit:hardis:remotesites:project",
-        "audit:remotesites:hardis:project",
-        "audit:remotesites:project:hardis",
-        "hardis:project:remotesites:audit",
-        "project:hardis:remotesites:audit",
-        "project:remotesites:hardis:audit",
-        "project:remotesites:audit:hardis",
-        "hardis:remotesites:project:audit",
-        "remotesites:hardis:project:audit",
-        "remotesites:project:hardis:audit",
-        "remotesites:project:audit:hardis",
-        "hardis:remotesites:audit:project",
-        "remotesites:hardis:audit:project",
-        "remotesites:audit:hardis:project",
-        "remotesites:audit:project:hardis"
-      ]
-    },
-    "hardis:project:configure:auth": {
-      "aliases": [],
-      "args": {},
-      "description": "\n## Command Behavior\n\n**Configures authentication between a Git branch and a target Salesforce org for CI/CD deployments.**\n\nThis command facilitates the setup of automated CI/CD pipelines, enabling seamless deployments from specific Git branches to designated Salesforce orgs. It supports both standard Salesforce orgs and Dev Hub configurations, catering to various enterprise deployment workflows.\n\nKey functionalities include:\n\n- **Org Selection/Login:** Guides the user to select an existing Salesforce org or log in to a new one.\n- **Git Branch Association:** Allows associating a specific Git branch with the chosen Salesforce org.\n- **Merge Target Definition:** Enables defining target Git branches into which the configured branch can merge, ensuring controlled deployment flows.\n- **Salesforce Username Configuration:** Prompts for the Salesforce username to be used by the CI server for deployments.\n- **SSL Certificate Generation:** Automatically generates an SSL certificate for secure authentication.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's implementation involves several key technical aspects:\n\n- **SF CLI Integration:** Utilizes \n@salesforce/sf-plugins-core\n for command structure and flag parsing.\n- **Interactive Prompts:** Employs the \nprompts\n library for interactive user input, guiding the configuration process.\n- **Git Integration:** Interacts with Git to retrieve branch information using \n`git().branch([\"--list\", \"-r\"])`\n.\n- **Configuration Management:** Leverages internal utilities (`checkConfig`, `getConfig`, `setConfig`, `setInConfigFile`) to read from and write to project-specific configuration files (e.g., `.sfdx-hardis.<branchName>.yml`).\n- **Salesforce CLI Execution:** Executes Salesforce CLI commands programmatically via `execSfdxJson` for org interactions.\n- **SSL Certificate Generation:** Calls `generateSSLCertificate` to create necessary SSL certificates for JWT-based authentication.\n- **WebSocket Communication:** Uses `WebSocketClient` for potential communication with external tools or processes, such as restarting the command in VS Code.\n- **Dependency Check:** Ensures the presence of `openssl` on the system, which is required for SSL certificate generation.\n",
-      "examples": [
-        "$ sf hardis:project:configure:auth"
-      ],
-      "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"
-        },
-        "devhub": {
-          "char": "b",
-          "description": "Configure project DevHub",
-          "name": "devhub",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "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,
-          "summary": "Username or alias of the target org.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        },
-        "target-dev-hub": {
-          "aliases": [
-            "targetdevhubusername"
-          ],
-          "char": "v",
-          "deprecateAliases": true,
-          "name": "target-dev-hub",
-          "noCacheDefault": true,
-          "required": false,
-          "summary": "Username or alias of the Dev Hub org.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": true,
-      "hiddenAliases": [],
-      "id": "hardis:project:configure:auth",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Configure authentication",
-      "requiresProject": false,
-      "requiresDependencies": [
-        "openssl"
-      ],
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "project",
-        "configure",
-        "auth.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:project:configure:auth",
-        "project:hardis:configure:auth",
-        "project:configure:hardis:auth",
-        "project:configure:auth:hardis",
-        "hardis:configure:project:auth",
-        "configure:hardis:project:auth",
-        "configure:project:hardis:auth",
-        "configure:project:auth:hardis",
-        "hardis:configure:auth:project",
-        "configure:hardis:auth:project",
-        "configure:auth:hardis:project",
-        "configure:auth:project:hardis",
-        "hardis:project:auth:configure",
-        "project:hardis:auth:configure",
-        "project:auth:hardis:configure",
-        "project:auth:configure:hardis",
-        "hardis:auth:project:configure",
-        "auth:hardis:project:configure",
-        "auth:project:hardis:configure",
-        "auth:project:configure:hardis",
-        "hardis:auth:configure:project",
-        "auth:hardis:configure:project",
-        "auth:configure:hardis:project",
-        "auth:configure:project:hardis"
-      ]
-    },
-    "hardis:project:convert:profilestopermsets": {
-      "aliases": [],
-      "args": {},
-      "description": "\n## Command Behavior\n\n**Converts existing Salesforce Profiles into Permission Sets, facilitating a more granular and recommended security model.**\n\nThis command helps in migrating permissions from Profiles to Permission Sets, which is a best practice for managing user access in Salesforce. It creates a new Permission Set for each specified Profile, adopting a naming convention of `PS_PROFILENAME`.\n\nKey functionalities:\n\n- **Profile to Permission Set Conversion:** Automatically extracts permissions from a Profile and creates a corresponding Permission Set.\n- **Naming Convention:** New Permission Sets are named with a `PS_` prefix followed by the Profile name (e.g., `PS_Standard_User`).\n- **Exclusion Filter:** Allows you to exclude specific Profiles from the conversion process using the `--except` flag.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **External Plugin Integration:** It relies on the `shane-sfdx-plugins` (specifically the `sf shane:profile:convert` command) to perform the actual conversion.\n- **File System Scan:** It reads the contents of the `force-app/main/default/profiles` directory to identify all available Profile metadata files.\n- **Command Execution:** For each identified Profile (that is not excluded), it constructs and executes the `sf shane:profile:convert` command with the appropriate Profile name and desired Permission Set name.\n- **Error Handling:** Includes basic error handling for the external command execution.\n</details>\n",
-      "examples": [
-        "$ sf hardis:project:convert:profilestopermsets"
-      ],
-      "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"
-        },
-        "except": {
-          "char": "e",
-          "description": "List of filters",
-          "name": "except",
-          "default": [],
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "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:convert:profilestopermsets",
-      "pluginAlias": "sfdx-hardis",
-      "pluginName": "sfdx-hardis",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": true,
-      "title": "Convert Profiles into Permission Sets",
-      "requiresProject": true,
-      "requiresSfdxPlugins": [
-        "shane-sfdx-plugins"
-      ],
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "hardis",
-        "project",
-        "convert",
-        "profilestopermsets.js"
-      ],
-      "aliasPermutations": [],
-      "permutations": [
-        "hardis:project:convert:profilestopermsets",
-        "project:hardis:convert:profilestopermsets",
-        "project:convert:hardis:profilestopermsets",
-        "project:convert:profilestopermsets:hardis",
-        "hardis:convert:project:profilestopermsets",
-        "convert:hardis:project:profilestopermsets",
-        "convert:project:hardis:profilestopermsets",
-        "convert:project:profilestopermsets:hardis",
-        "hardis:convert:profilestopermsets:project",
-        "convert:hardis:profilestopermsets:project",
-        "convert:profilestopermsets:hardis:project",
-        "convert:profilestopermsets:project:hardis",
-        "hardis:project:profilestopermsets:convert",
-        "project:hardis:profilestopermsets:convert",
-        "project:profilestopermsets:hardis:convert",
-        "project:profilestopermsets:convert:hardis",
-        "hardis:profilestopermsets:project:convert",
-        "profilestopermsets:hardis:project:convert",
-        "profilestopermsets:project:hardis:convert",
-        "profilestopermsets:project:convert:hardis",
-        "hardis:profilestopermsets:convert:project",
-        "profilestopermsets:hardis:convert:project",
-        "profilestopermsets:convert:hardis:project",
-        "profilestopermsets:convert:project:hardis"
+        "hardis:project:audit:remotesites",
+        "project:hardis:audit:remotesites",
+        "project:audit:hardis:remotesites",
+        "project:audit:remotesites:hardis",
+        "hardis:audit:project:remotesites",
+        "audit:hardis:project:remotesites",
+        "audit:project:hardis:remotesites",
+        "audit:project:remotesites:hardis",
+        "hardis:audit:remotesites:project",
+        "audit:hardis:remotesites:project",
+        "audit:remotesites:hardis:project",
+        "audit:remotesites:project:hardis",
+        "hardis:project:remotesites:audit",
+        "project:hardis:remotesites:audit",
+        "project:remotesites:hardis:audit",
+        "project:remotesites:audit:hardis",
+        "hardis:remotesites:project:audit",
+        "remotesites:hardis:project:audit",
+        "remotesites:project:hardis:audit",
+        "remotesites:project:audit:hardis",
+        "hardis:remotesites:audit:project",
+        "remotesites:hardis:audit:project",
+        "remotesites:audit:hardis:project",
+        "remotesites:audit:project:hardis"
       ]
     },
     "hardis:project:clean:emptyitems": {
@@ -11757,6 +11525,238 @@
         "xml:clean:project:hardis"
       ]
     },
+    "hardis:project:configure:auth": {
+      "aliases": [],
+      "args": {},
+      "description": "\n## Command Behavior\n\n**Configures authentication between a Git branch and a target Salesforce org for CI/CD deployments.**\n\nThis command facilitates the setup of automated CI/CD pipelines, enabling seamless deployments from specific Git branches to designated Salesforce orgs. It supports both standard Salesforce orgs and Dev Hub configurations, catering to various enterprise deployment workflows.\n\nKey functionalities include:\n\n- **Org Selection/Login:** Guides the user to select an existing Salesforce org or log in to a new one.\n- **Git Branch Association:** Allows associating a specific Git branch with the chosen Salesforce org.\n- **Merge Target Definition:** Enables defining target Git branches into which the configured branch can merge, ensuring controlled deployment flows.\n- **Salesforce Username Configuration:** Prompts for the Salesforce username to be used by the CI server for deployments.\n- **SSL Certificate Generation:** Automatically generates an SSL certificate for secure authentication.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's implementation involves several key technical aspects:\n\n- **SF CLI Integration:** Utilizes \n@salesforce/sf-plugins-core\n for command structure and flag parsing.\n- **Interactive Prompts:** Employs the \nprompts\n library for interactive user input, guiding the configuration process.\n- **Git Integration:** Interacts with Git to retrieve branch information using \n`git().branch([\"--list\", \"-r\"])`\n.\n- **Configuration Management:** Leverages internal utilities (`checkConfig`, `getConfig`, `setConfig`, `setInConfigFile`) to read from and write to project-specific configuration files (e.g., `.sfdx-hardis.<branchName>.yml`).\n- **Salesforce CLI Execution:** Executes Salesforce CLI commands programmatically via `execSfdxJson` for org interactions.\n- **SSL Certificate Generation:** Calls `generateSSLCertificate` to create necessary SSL certificates for JWT-based authentication.\n- **WebSocket Communication:** Uses `WebSocketClient` for potential communication with external tools or processes, such as restarting the command in VS Code.\n- **Dependency Check:** Ensures the presence of `openssl` on the system, which is required for SSL certificate generation.\n",
+      "examples": [
+        "$ sf hardis:project:configure:auth"
+      ],
+      "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"
+        },
+        "devhub": {
+          "char": "b",
+          "description": "Configure project DevHub",
+          "name": "devhub",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "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,
+          "summary": "Username or alias of the target org.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        },
+        "target-dev-hub": {
+          "aliases": [
+            "targetdevhubusername"
+          ],
+          "char": "v",
+          "deprecateAliases": true,
+          "name": "target-dev-hub",
+          "noCacheDefault": true,
+          "required": false,
+          "summary": "Username or alias of the Dev Hub org.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": true,
+      "hiddenAliases": [],
+      "id": "hardis:project:configure:auth",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Configure authentication",
+      "requiresProject": false,
+      "requiresDependencies": [
+        "openssl"
+      ],
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "project",
+        "configure",
+        "auth.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:project:configure:auth",
+        "project:hardis:configure:auth",
+        "project:configure:hardis:auth",
+        "project:configure:auth:hardis",
+        "hardis:configure:project:auth",
+        "configure:hardis:project:auth",
+        "configure:project:hardis:auth",
+        "configure:project:auth:hardis",
+        "hardis:configure:auth:project",
+        "configure:hardis:auth:project",
+        "configure:auth:hardis:project",
+        "configure:auth:project:hardis",
+        "hardis:project:auth:configure",
+        "project:hardis:auth:configure",
+        "project:auth:hardis:configure",
+        "project:auth:configure:hardis",
+        "hardis:auth:project:configure",
+        "auth:hardis:project:configure",
+        "auth:project:hardis:configure",
+        "auth:project:configure:hardis",
+        "hardis:auth:configure:project",
+        "auth:hardis:configure:project",
+        "auth:configure:hardis:project",
+        "auth:configure:project:hardis"
+      ]
+    },
+    "hardis:project:convert:profilestopermsets": {
+      "aliases": [],
+      "args": {},
+      "description": "\n## Command Behavior\n\n**Converts existing Salesforce Profiles into Permission Sets, facilitating a more granular and recommended security model.**\n\nThis command helps in migrating permissions from Profiles to Permission Sets, which is a best practice for managing user access in Salesforce. It creates a new Permission Set for each specified Profile, adopting a naming convention of `PS_PROFILENAME`.\n\nKey functionalities:\n\n- **Profile to Permission Set Conversion:** Automatically extracts permissions from a Profile and creates a corresponding Permission Set.\n- **Naming Convention:** New Permission Sets are named with a `PS_` prefix followed by the Profile name (e.g., `PS_Standard_User`).\n- **Exclusion Filter:** Allows you to exclude specific Profiles from the conversion process using the `--except` flag.\n\n<details markdown=\"1\">\n<summary>Technical explanations</summary>\n\nThe command's technical implementation involves:\n\n- **External Plugin Integration:** It relies on the `shane-sfdx-plugins` (specifically the `sf shane:profile:convert` command) to perform the actual conversion.\n- **File System Scan:** It reads the contents of the `force-app/main/default/profiles` directory to identify all available Profile metadata files.\n- **Command Execution:** For each identified Profile (that is not excluded), it constructs and executes the `sf shane:profile:convert` command with the appropriate Profile name and desired Permission Set name.\n- **Error Handling:** Includes basic error handling for the external command execution.\n</details>\n",
+      "examples": [
+        "$ sf hardis:project:convert:profilestopermsets"
+      ],
+      "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"
+        },
+        "except": {
+          "char": "e",
+          "description": "List of filters",
+          "name": "except",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "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:convert:profilestopermsets",
+      "pluginAlias": "sfdx-hardis",
+      "pluginName": "sfdx-hardis",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": true,
+      "title": "Convert Profiles into Permission Sets",
+      "requiresProject": true,
+      "requiresSfdxPlugins": [
+        "shane-sfdx-plugins"
+      ],
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "hardis",
+        "project",
+        "convert",
+        "profilestopermsets.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "hardis:project:convert:profilestopermsets",
+        "project:hardis:convert:profilestopermsets",
+        "project:convert:hardis:profilestopermsets",
+        "project:convert:profilestopermsets:hardis",
+        "hardis:convert:project:profilestopermsets",
+        "convert:hardis:project:profilestopermsets",
+        "convert:project:hardis:profilestopermsets",
+        "convert:project:profilestopermsets:hardis",
+        "hardis:convert:profilestopermsets:project",
+        "convert:hardis:profilestopermsets:project",
+        "convert:profilestopermsets:hardis:project",
+        "convert:profilestopermsets:project:hardis",
+        "hardis:project:profilestopermsets:convert",
+        "project:hardis:profilestopermsets:convert",
+        "project:profilestopermsets:hardis:convert",
+        "project:profilestopermsets:convert:hardis",
+        "hardis:profilestopermsets:project:convert",
+        "profilestopermsets:hardis:project:convert",
+        "profilestopermsets:project:hardis:convert",
+        "profilestopermsets:project:convert:hardis",
+        "hardis:profilestopermsets:convert:project",
+        "profilestopermsets:hardis:convert:project",
+        "profilestopermsets:convert:hardis:project",
+        "profilestopermsets:convert:project:hardis"
+      ]
+    },
     "hardis:project:deploy:notify": {
       "aliases": [],
       "args": {},
@@ -15719,5 +15719,5 @@
       ]
     }
   },
-  "version": "6.15.2-beta202512140349.0"
+  "version": "6.16.0"
 }