@salesforce/plugin-deploy-retrieve 3.8.4 → 3.9.0

package/messages/retrieve.start.md

@@ -8,7 +8,7 @@ You must run this command from within a project.
 
 Metadata components are retrieved in source format by default. Retrieve them in metadata format by specifying the --target-metadata-dir flag, which retrieves the components into a ZIP file in the specified directory.
 
-If your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production orgs, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the "sf org create scratch|sandbox" commands.
+If your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production orgs, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the "<%= config.bin %> org create scratch|sandbox" commands.
 
 To retrieve multiple metadata components, either use multiple --metadata <name> flags or use a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.
 
@@ -16,28 +16,28 @@ To retrieve multiple metadata components, either use multiple --metadata <name>
 
 - Retrieve all remote changes from your default org:
 
-  sf <%= command.id %>
+  <%= config.bin %> <%= command.id %>
 
 - Retrieve the source files in the "force-app" directory from an org with alias "my-scratch":
 
-  sf <%= command.id %> --source-dir force-app --target-org my-scratch
+  <%= config.bin %> <%= command.id %> --source-dir force-app --target-org my-scratch
 
 - Retrieve all the Apex classes and custom objects whose source is in the "force-app" directory. The list views, layouts, etc, that are associated with the custom objects are also retrieved. Both examples are equivalent:
 
-  sf <%= command.id %> --source-dir force-app/main/default/classes force-app/main/default/objects
-  sf <%= command.id %> --source-dir force-app/main/default/classes --source-dir force-app/main/default/objects
+  <%= config.bin %> <%= command.id %> --source-dir force-app/main/default/classes force-app/main/default/objects
+  <%= config.bin %> <%= command.id %> --source-dir force-app/main/default/classes --source-dir force-app/main/default/objects
 
 - Retrieve all Apex classes that are in all package directories defined in the "sfdx-project.json" file:
 
-  sf <%= command.id %> --metadata ApexClass
+  <%= config.bin %> <%= command.id %> --metadata ApexClass
 
 - Retrieve a specific Apex class; ignore any conflicts between the local project and org (be careful with this flag, because it will overwrite the Apex class source files in your local project if there are conflicts!):
 
-  sf <%= command.id %> --metadata ApexClass:MyApexClass --ignore-conflicts
+  <%= config.bin %> <%= command.id %> --metadata ApexClass:MyApexClass --ignore-conflicts
 
 - Retrieve specific Apex classes that match a pattern; in this example, retrieve Apex classes whose names contain the string "MyApex":
 
-      sf <%= command.id %> --metadata 'ApexClass:MyApex*'
+      <%= config.bin %> <%= command.id %> --metadata 'ApexClass:MyApex*'
 
 - Retrieve a custom object called ExcitingObject that's in the SBQQ namespace:
 
@@ -49,29 +49,29 @@ To retrieve multiple metadata components, either use multiple --metadata <name>
 
 - Retrieve all custom objects and Apex classes found in all defined package directories (both examples are equivalent):
 
-  sf <%= command.id %> --metadata CustomObject ApexClass
-  sf <%= command.id %> --metadata CustomObject --metadata ApexClass
+  <%= config.bin %> <%= command.id %> --metadata CustomObject ApexClass
+  <%= config.bin %> <%= command.id %> --metadata CustomObject --metadata ApexClass
 
 - Retrieve all metadata components listed in a manifest:
 
-  sf <%= command.id %> --manifest path/to/package.xml
+  <%= config.bin %> <%= command.id %> --manifest path/to/package.xml
 
 - Retrieve metadata from a package:
 
-  sf <%= command.id %> --package-name MyPackageName
+  <%= config.bin %> <%= command.id %> --package-name MyPackageName
 
 - Retrieve metadata from multiple packages, one of which has a space in its name (both examples are equivalent):
 
-  sf <%= command.id %> --package-name Package1 "PackageName With Spaces" Package3
-  sf <%= command.id %> --package-name Package1 --package-name "PackageName With Spaces" --package-name Package3
+  <%= config.bin %> <%= command.id %> --package-name Package1 "PackageName With Spaces" Package3
+  <%= config.bin %> <%= command.id %> --package-name Package1 --package-name "PackageName With Spaces" --package-name Package3
 
 - Retrieve the metadata components listed in the force-app directory, but retrieve them in metadata format into a ZIP file in the "output" directory:
 
-  sf <%= command.id %> --source-dir force-app --target-metadata-dir output
+  <%= config.bin %> <%= command.id %> --source-dir force-app --target-metadata-dir output
 
 - Retrieve in metadata format and automatically extract the contents into the "output" directory:
 
-  sf <%= command.id %> --source-dir force-app --target-metadata-dir output --unzip
+  <%= config.bin %> <%= command.id %> --source-dir force-app --target-metadata-dir output --unzip
 
 # flags.api-version.summary
 

package/oclif.manifest.json

@@ -8,8 +8,8 @@
       "deprecateAliases": true,
       "description": "To use Salesforce CLI to work with components that you retrieved via Metadata API, first convert your files from the metadata format to the source format using this command.\n\nTo convert files from the source format back to the metadata format, run \"sf project convert source\".\n\nTo convert multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
       "examples": [
-        "Convert metadata formatted files in the specified directory into source formatted files; writes converted files to your default package directory:\n$ sf <%= command.id %> --root-dir path/to/metadata",
-        "Similar to previous example, but writes converted files to the specified output directory:\n$ sf <%= command.id %> --root-dir path/to/metadata --output-dir path/to/outputdir"
+        "Convert metadata formatted files in the specified directory into source formatted files; writes converted files to your default package directory:\n$ <%= config.bin %> <%= command.id %> --root-dir path/to/metadata",
+        "Similar to previous example, but writes converted files to the specified output directory:\n$ <%= config.bin %> <%= command.id %> --root-dir path/to/metadata --output-dir path/to/outputdir"
       ],
       "flags": {
         "json": {
@@ -246,10 +246,10 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "To convert source-formatted files into the metadata format, so that you can deploy them using Metadata API, run this command. Then deploy the metadata using \"sf project deploy\".\n\nTo convert Metadata API–formatted files into the source format, run \"sf project convert mdapi\".\n\nTo specify a package name that includes spaces, enclose the name in single quotes.\n\nTo convert multiple components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
+      "description": "To convert source-formatted files into the metadata format, so that you can deploy them using Metadata API, run this command. Then deploy the metadata using \"<%= config.bin %> project deploy\".\n\nTo convert Metadata API–formatted files into the source format, run \"<%= config.bin %> project convert mdapi\".\n\nTo specify a package name that includes spaces, enclose the name in single quotes.\n\nTo convert multiple components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
       "examples": [
-        "Convert source-formatted files in the specified directory into metadata-formatted files; writes converted files into a new directory:\n$ sf <%= command.id %> --root-dir path/to/source",
-        "Similar to previous example, but writes converted files to the specified output directory and associates the files with the specified package:\n$ sf <%= command.id %> --root-dir path/to/source --output-dir path/to/outputdir --package-name 'My Package'"
+        "Convert source-formatted files in the specified directory into metadata-formatted files; writes converted files into a new directory:\n$ <%= config.bin %> <%= command.id %> --root-dir path/to/source",
+        "Similar to previous example, but writes converted files to the specified output directory and associates the files with the specified package:\n$ <%= config.bin %> <%= command.id %> --root-dir path/to/source --output-dir path/to/outputdir --package-name 'My Package'"
       ],
       "flags": {
         "json": {
@@ -309,7 +309,7 @@
           "deprecateAliases": true,
           "name": "output-dir",
           "summary": "Output directory to store the Metadata API–formatted files in.",
-          "default": "metadataPackage_1717296698220",
+          "default": "metadataPackage_1717649514619",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -408,12 +408,12 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "Use this command to delete components from orgs that don’t have source tracking. To remove deleted items from orgs that have source tracking enabled, \"sf project deploy start\".\n\nWhen you run this command, both the local source file and the metadata component in the org are deleted.\n\nTo delete multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
+      "description": "Use this command to delete components from orgs that don’t have source tracking. To remove deleted items from orgs that have source tracking enabled, \"<%= config.bin %> project deploy start\".\n\nWhen you run this command, both the local source file and the metadata component in the org are deleted.\n\nTo delete multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
       "examples": [
-        "Delete all local Apex source files and all Apex classes from the org with alias \"my-scratch\":\nsf <%= command.id %> --metadata ApexClass --target-org my-scratch",
-        "Delete a specific Apex class and a Profile that has a space in it from your default org; don't prompt for confirmation:\nsf <%= command.id %> --metadata ApexClass:MyFabulousApexClass --metadata \"Profile: My Profile\" --no-prompt",
-        "Run the tests that aren’t in any managed packages as part of the deletion; if the delete succeeds, and the org has source-tracking enabled, update the source tracking information:\nsf <%= command.id %> --metadata ApexClass --test-level RunLocalTests --track-source",
-        "Delete the Apex source files in a directory and the corresponding components from your default org:\nsf <%= command.id %> --source-dir force-app/main/default/classes"
+        "Delete all local Apex source files and all Apex classes from the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --metadata ApexClass --target-org my-scratch",
+        "Delete a specific Apex class and a Profile that has a space in it from your default org; don't prompt for confirmation:\n<%= config.bin %> <%= command.id %> --metadata ApexClass:MyFabulousApexClass --metadata \"Profile: My Profile\" --no-prompt",
+        "Run the tests that aren’t in any managed packages as part of the deletion; if the delete succeeds, and the org has source-tracking enabled, update the source tracking information:\n<%= config.bin %> <%= command.id %> --metadata ApexClass --test-level RunLocalTests --track-source",
+        "Delete the Apex source files in a directory and the corresponding components from your default org:\n<%= config.bin %> <%= command.id %> --source-dir force-app/main/default/classes"
       ],
       "flags": {
         "json": {
@@ -630,7 +630,7 @@
       "deprecateAliases": true,
       "description": "WARNING: This command deletes or overwrites all existing source tracking files. Use with extreme caution.\n\nDeletes all local source tracking information. When you next run 'project deploy preview', Salesforce CLI displays all local and remote files as changed, and any files with the same name are listed as conflicts.",
       "examples": [
-        "Delete local source tracking for the org with alias \"my-scratch\":\n$ sf <%= command.id %> --target-org my-scratch"
+        "Delete local source tracking for the org with alias \"my-scratch\":\n$ <%= config.bin %> <%= command.id %> --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -757,8 +757,8 @@
       "deprecateAliases": true,
       "description": "Use this command to cancel a deploy operation that hasn't yet completed in the org. Deploy operations include standard deploys, quick deploys, deploy validations, and deploy cancellations.\n\nRun this command by either passing it a job ID or specifying the --use-most-recent flag to use the job ID of the most recent deploy operation.",
       "examples": [
-        "Cancel a deploy operation using a job ID:\nsf <%= command.id %> --job-id 0Af0x000017yLUFCA2",
-        "Cancel the most recent deploy operation:\nsf <%= command.id %> --use-most-recent"
+        "Cancel a deploy operation using a job ID:\n<%= config.bin %> <%= command.id %> --job-id 0Af0x000017yLUFCA2",
+        "Cancel the most recent deploy operation:\n<%= config.bin %> <%= command.id %> --use-most-recent"
       ],
       "flags": {
         "json": {
@@ -786,7 +786,7 @@
           "type": "option"
         },
         "async": {
-          "description": "The command immediately returns the control of the terminal to you. This way, you can continue to use the CLI. To resume watching the cancellation, run \"sf project deploy resume\". To check the status of the cancellation, run \"sf project deploy report\".",
+          "description": "The command immediately returns the control of the terminal to you. This way, you can continue to use the CLI. To resume watching the cancellation, run \"<%= config.bin %> project deploy resume\". To check the status of the cancellation, run \"<%= config.bin %> project deploy report\".",
           "exclusive": [
             "wait"
           ],
@@ -797,7 +797,7 @@
         },
         "job-id": {
           "char": "i",
-          "description": "These commands return a job ID if they time out or you specified the --async flag:\n\n- sf project deploy start\n- sf project deploy validate\n- sf project deploy quick\n- sf project deploy cancel\n\nThe job ID is valid for 10 days from when you started the deploy operation.",
+          "description": "These commands return a job ID if they time out or you specified the --async flag:\n\n- <%= config.bin %> project deploy start\n- <%= config.bin %> project deploy validate\n- <%= config.bin %> project deploy quick\n- <%= config.bin %> project deploy cancel\n\nThe job ID is valid for 10 days from when you started the deploy operation.",
           "name": "job-id",
           "summary": "Job ID of the deploy operation you want to cancel.",
           "hasDynamicHelp": false,
@@ -814,7 +814,7 @@
         },
         "wait": {
           "char": "w",
-          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you. To resume watching the cancellation, run \"sf project deploy resume\". To check the status of the cancellation, run \"sf project deploy report\".",
+          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you. To resume watching the cancellation, run \"<%= config.bin %> project deploy resume\". To check the status of the cancellation, run \"<%= config.bin %> project deploy report\".",
           "exclusive": [
             "async"
           ],
@@ -866,13 +866,13 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "You must run this command from within a project.\n\nThe command outputs a table that describes what will happen if you run the \"sf project deploy start\" command. The table lists the metadata components that will be deployed and deleted. The table also lists the current conflicts between files in your local project and components in the org. Finally, the table lists the files that won't be deployed because they're included in your .forceignore file.\n\nIf your org allows source tracking, then this command displays potential conflicts between the org and your local project. Some orgs, such as production org, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"sf org create scratch|sandbox\" commands.\n\nTo preview the deployment of multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
+      "description": "You must run this command from within a project.\n\nThe command outputs a table that describes what will happen if you run the \"<%= config.bin %> project deploy start\" command. The table lists the metadata components that will be deployed and deleted. The table also lists the current conflicts between files in your local project and components in the org. Finally, the table lists the files that won't be deployed because they're included in your .forceignore file.\n\nIf your org allows source tracking, then this command displays potential conflicts between the org and your local project. Some orgs, such as production org, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"<%= config.bin %> org create scratch|sandbox\" commands.\n\nTo preview the deployment of multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
       "examples": [
-        "NOTE: The commands to preview a deployment and actually deploy it use similar flags. We provide a few preview examples here, but see the help for \"sf project deploy start\" for more examples that you can adapt for previewing.",
-        "Preview the deployment of source files in a directory, such as force-app, to your default org:\nsf <%= command.id %>  --source-dir force-app",
-        "Preview the deployment of all Apex classes to an org with alias \"my-scratch\":\nsf <%= command.id %> --metadata ApexClass --target-org my-scratch",
-        "Preview deployment of a specific Apex class:\nsf <%= command.id %> --metadata ApexClass:MyApexClass",
-        "Preview deployment of all components listed in a manifest:\nsf <%= command.id %> --manifest path/to/package.xml"
+        "NOTE: The commands to preview a deployment and actually deploy it use similar flags. We provide a few preview examples here, but see the help for \"<%= config.bin %> project deploy start\" for more examples that you can adapt for previewing.",
+        "Preview the deployment of source files in a directory, such as force-app, to your default org:\n<%= config.bin %> <%= command.id %>  --source-dir force-app",
+        "Preview the deployment of all Apex classes to an org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --metadata ApexClass --target-org my-scratch",
+        "Preview deployment of a specific Apex class:\n<%= config.bin %> <%= command.id %> --metadata ApexClass:MyApexClass",
+        "Preview deployment of all components listed in a manifest:\n<%= config.bin %> <%= command.id %> --manifest path/to/package.xml"
       ],
       "flags": {
         "json": {
@@ -994,10 +994,10 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "Before you run this command, first create a validated deployment with the \"sf project deploy validate\" command, which returns a job ID. Validated deployments haven't been deployed to the org yet; you deploy them with this command. Either pass the job ID to this command or use the --use-most-recent flag to use the job ID of the most recently validated deployment. For the quick deploy to succeed, the associated validated deployment must also have succeeded.\n\nExecuting this quick deploy command takes less time than a standard deploy because it skips running Apex tests. These tests were previously run as part of the validation. Validating first and then running a quick deploy is useful if the deployment to your production org take several hours and you don’t want to risk a failed deploy.\n\nThis command doesn't support source-tracking. The source you deploy overwrites the corresponding metadata in your org. This command doesn’t attempt to merge your source with the versions in your org.\n\nNote: Don't use this command on sandboxes; the command is intended to be used on production orgs. By default, sandboxes don't run tests during a deploy. Use `sf project deploy start` instead.",
+      "description": "Before you run this command, first create a validated deployment with the \"<%= config.bin %> project deploy validate\" command, which returns a job ID. Validated deployments haven't been deployed to the org yet; you deploy them with this command. Either pass the job ID to this command or use the --use-most-recent flag to use the job ID of the most recently validated deployment. For the quick deploy to succeed, the associated validated deployment must also have succeeded.\n\nExecuting this quick deploy command takes less time than a standard deploy because it skips running Apex tests. These tests were previously run as part of the validation. Validating first and then running a quick deploy is useful if the deployment to your production org take several hours and you don’t want to risk a failed deploy.\n\nThis command doesn't support source-tracking. The source you deploy overwrites the corresponding metadata in your org. This command doesn’t attempt to merge your source with the versions in your org.\n\nNote: Don't use this command on sandboxes; the command is intended to be used on production orgs. By default, sandboxes don't run tests during a deploy. Use \"<%= config.bin %> project deploy start\" instead.",
       "examples": [
-        "Run a quick deploy to your default org using a job ID:\nsf <%= command.id %> --job-id 0Af0x000017yLUFCA2",
-        "Asynchronously run a quick deploy of the most recently validated deployment to an org with alias \"my-prod-org\":\nsf <%= command.id %> --async --use-most-recent --target-org my-prod-org"
+        "Run a quick deploy to your default org using a job ID:\n<%= config.bin %> <%= command.id %> --job-id 0Af0x000017yLUFCA2",
+        "Asynchronously run a quick deploy of the most recently validated deployment to an org with alias \"my-prod-org\":\n<%= config.bin %> <%= command.id %> --async --use-most-recent --target-org my-prod-org"
       ],
       "flags": {
         "json": {
@@ -1016,7 +1016,7 @@
           "type": "option"
         },
         "async": {
-          "description": "The command immediately returns the control of the terminal to you. This way, you can continue to use the CLI. To resume watching the deploy, run \"sf project deploy resume\". To check the status of the deploy, run \"sf project deploy report\".",
+          "description": "The command immediately returns the control of the terminal to you. This way, you can continue to use the CLI. To resume watching the deploy, run \"<%= config.bin %> project deploy resume\". To check the status of the deploy, run \"<%= config.bin %> project deploy report\".",
           "exclusive": [
             "wait"
           ],
@@ -1071,7 +1071,7 @@
         },
         "wait": {
           "char": "w",
-          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you. To resume watching the deploy, run \"sf project deploy resume\". To check the status of the deploy, run \"sf project deploy report\".",
+          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you. To resume watching the deploy, run \"<%= config.bin %> project deploy resume\". To check the status of the deploy, run \"<%= config.bin %> project deploy report\".",
           "exclusive": [
             "async"
           ],
@@ -1168,9 +1168,9 @@
       "deprecateAliases": true,
       "description": "Deploy operations include standard deploys, quick deploys, deploy validations, and deploy cancellations.\n\nRun this command by either passing it a job ID or specifying the --use-most-recent flag to use the job ID of the most recent deploy operation. If you specify the --wait flag, the command polls for the status every second until the timeout of --wait minutes. If you don't specify the --wait flag, the command simply checks and displays the status of the deploy; the command doesn't poll for the status.\n\nYou typically don't specify the --target-org flag because the cached job already references the org to which you deployed. But if you run this command on a computer different than the one from which you deployed, then you must specify the --target-org and it must point to the same org.\n\nThis command doesn't update source tracking information.",
       "examples": [
-        "Check the status using a job ID:\nsf <%= command.id %> --job-id 0Af0x000017yLUFCA2",
-        "Check the status of the most recent deploy operation:\nsf <%= command.id %> --use-most-recent",
-        "Poll for the status using a job ID and target org:\nsf <%= command.id %> --job-id 0Af0x000017yLUFCA2 --target-org me@my.org --wait 30"
+        "Check the status using a job ID:\n<%= config.bin %> <%= command.id %> --job-id 0Af0x000017yLUFCA2",
+        "Check the status of the most recent deploy operation:\n<%= config.bin %> <%= command.id %> --use-most-recent",
+        "Poll for the status using a job ID and target org:\n<%= config.bin %> <%= command.id %> --job-id 0Af0x000017yLUFCA2 --target-org me@my.org --wait 30"
       ],
       "flags": {
         "json": {
@@ -1199,7 +1199,7 @@
         },
         "job-id": {
           "char": "i",
-          "description": "These commands return a job ID if they time out or you specified the --async flag:\n\n- sf project deploy start\n- sf project deploy validate\n- sf project deploy quick\n- sf project deploy cancel\n\nThe job ID is valid for 10 days from when you started the deploy operation.",
+          "description": "These commands return a job ID if they time out or you specified the --async flag:\n\n- <%= config.bin %> project deploy start\n- <%= config.bin %> project deploy validate\n- <%= config.bin %> project deploy quick\n- <%= config.bin %> project deploy cancel\n\nThe job ID is valid for 10 days from when you started the deploy operation.",
           "name": "job-id",
           "summary": "Job ID of the deploy operation you want to check the status of.",
           "hasDynamicHelp": false,
@@ -1262,7 +1262,7 @@
         },
         "wait": {
           "char": "w",
-          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you and returns the job ID. To resume the deployment, run \"sf project deploy resume\". To check the status of the deployment, run \"sf project deploy report\".",
+          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you and returns the job ID. To resume the deployment, run \"<%= config.bin %> project deploy resume\". To check the status of the deployment, run \"<%= config.bin %> project deploy report\".",
           "name": "wait",
           "summary": "Number of minutes to wait for command to complete and display results.",
           "hasDynamicHelp": true,
@@ -1313,8 +1313,8 @@
       "deprecateAliases": true,
       "description": "Use this command to resume watching a deploy operation if the original command times out or you specified the --async flag. Deploy operations include standard deploys, quick deploys, deploy validations, and deploy cancellations. This command doesn't resume the original operation itself, because the operation always continues after you've started it, regardless of whether you're watching it or not. When the deploy completes, source tracking information is updated as needed.\n\nRun this command by either passing it a job ID or specifying the --use-most-recent flag to use the job ID of the most recent deploy operation.",
       "examples": [
-        "Resume watching a deploy operation using a job ID:\nsf <%= command.id %> --job-id 0Af0x000017yLUFCA2",
-        "Resume watching the most recent deploy operation:\nsf <%= command.id %> --use-most-recent"
+        "Resume watching a deploy operation using a job ID:\n<%= config.bin %> <%= command.id %> --job-id 0Af0x000017yLUFCA2",
+        "Resume watching the most recent deploy operation:\n<%= config.bin %> <%= command.id %> --use-most-recent"
       ],
       "flags": {
         "json": {
@@ -1343,7 +1343,7 @@
         },
         "job-id": {
           "char": "i",
-          "description": "These commands return a job ID if they time out or you specified the --async flag:\n\n- sf project deploy start\n- sf project deploy validate\n- sf project deploy quick\n- sf project deploy cancel\n\nThe job ID is valid for 10 days from when you started the deploy operation.",
+          "description": "These commands return a job ID if they time out or you specified the --async flag:\n\n- <%= config.bin %> project deploy start\n- <%= config.bin %> project deploy validate\n- <%= config.bin %> project deploy quick\n- <%= config.bin %> project deploy cancel\n\nThe job ID is valid for 10 days from when you started the deploy operation.",
           "name": "job-id",
           "summary": "Job ID of the deploy operation you want to resume.",
           "hasDynamicHelp": false,
@@ -1369,7 +1369,7 @@
         },
         "wait": {
           "char": "w",
-          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you. To resume watching the deploy operation, run this command again. To check the status of the deploy operation, run \"sf project deploy report\".",
+          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you. To resume watching the deploy operation, run this command again. To check the status of the deploy operation, run \"<%= config.bin %> project deploy report\".",
           "name": "wait",
           "summary": "Number of minutes to wait for the command to complete and display results.",
           "hasDynamicHelp": true,
@@ -1506,20 +1506,20 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "You must run this command from within a project.\n\nMetadata components are deployed in source format by default. Deploy them in metadata format by specifying the --metadata-dir flag, which specifies the root directory or ZIP file that contains the metadata formatted files you want to deploy.\n\nIf your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production orgs, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"sf org create scratch|sandbox\" commands.\n\nTo deploy multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
+      "description": "You must run this command from within a project.\n\nMetadata components are deployed in source format by default. Deploy them in metadata format by specifying the --metadata-dir flag, which specifies the root directory or ZIP file that contains the metadata formatted files you want to deploy.\n\nIf your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production orgs, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"<%= config.bin %> org create scratch|sandbox\" commands.\n\nTo deploy multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
       "examples": [
-        "Deploy local changes not in the org; uses your default org:\nsf <%= command.id %>",
-        "Deploy all source files in the \"force-app\" directory to an org with alias \"my-scratch\"; show only concise output, in other words don't print a list of all the source that was deployed:\nsf <%= command.id %>  --source-dir force-app --target-org my-scratch --concise",
-        "Deploy all the Apex classes and custom objects that are in the \"force-app\" directory. The list views, layouts, etc, that are associated with the custom objects are also deployed. Both examples are equivalent:\nsf <%= command.id %> --source-dir force-app/main/default/classes force-app/main/default/objects\nsf <%= command.id %> --source-dir force-app/main/default/classes --source-dir force-app/main/default/objects",
-        "Deploy all Apex classes that are in all package directories defined in the \"sfdx-project.json\" file:\nsf <%= command.id %> --metadata ApexClass",
-        "Deploy a specific Apex class; ignore any conflicts between the local project and org (be careful with this flag, because it will overwrite the Apex class in the org if there are conflicts!):\nsf <%= command.id %> --metadata ApexClass:MyApexClass --ignore-conflicts",
-        "Deploy specific Apex classes that match a pattern; in this example, deploy Apex classes whose names contain the string \"MyApex\". Also ignore any deployment warnings (again, be careful with this flag! You typically want to see the warnings):\nsf <%= command.id %> --metadata 'ApexClass:MyApex*' --ignore-warnings",
+        "Deploy local changes not in the org; uses your default org:\n<%= config.bin %> <%= command.id %>",
+        "Deploy all source files in the \"force-app\" directory to an org with alias \"my-scratch\"; show only concise output, in other words don't print a list of all the source that was deployed:\n<%= config.bin %> <%= command.id %>  --source-dir force-app --target-org my-scratch --concise",
+        "Deploy all the Apex classes and custom objects that are in the \"force-app\" directory. The list views, layouts, etc, that are associated with the custom objects are also deployed. Both examples are equivalent:\n<%= config.bin %> <%= command.id %> --source-dir force-app/main/default/classes force-app/main/default/objects\n<%= config.bin %> <%= command.id %> --source-dir force-app/main/default/classes --source-dir force-app/main/default/objects",
+        "Deploy all Apex classes that are in all package directories defined in the \"sfdx-project.json\" file:\n<%= config.bin %> <%= command.id %> --metadata ApexClass",
+        "Deploy a specific Apex class; ignore any conflicts between the local project and org (be careful with this flag, because it will overwrite the Apex class in the org if there are conflicts!):\n<%= config.bin %> <%= command.id %> --metadata ApexClass:MyApexClass --ignore-conflicts",
+        "Deploy specific Apex classes that match a pattern; in this example, deploy Apex classes whose names contain the string \"MyApex\". Also ignore any deployment warnings (again, be careful with this flag! You typically want to see the warnings):\n<%= config.bin %> <%= command.id %> --metadata 'ApexClass:MyApex*' --ignore-warnings",
         "Deploy a custom object called ExcitingObject that's in the SBQQ namespace:\nsf <%= command.id %> --metadata CustomObject:SBQQ__ExcitingObject",
         "Deploy all custom objects in the SBQQ namespace by using a wildcard and quotes:\nsf <%= command.id %> --metadata 'CustomObject:SBQQ__*'",
-        "Deploy all custom objects and Apex classes found in all defined package directories (both examples are equivalent):\nsf <%= command.id %> --metadata CustomObject ApexClass\nsf <%= command.id %> --metadata CustomObject --metadata ApexClass",
-        "Deploy all Apex classes and a profile that has a space in its name:\nsf <%= command.id %> --metadata ApexClass --metadata \"Profile:My Profile\"",
-        "Deploy all components listed in a manifest:\nsf <%= command.id %> --manifest path/to/package.xml",
-        "Run the tests that aren’t in any managed packages as part of a deployment:\nsf <%= command.id %> --metadata ApexClass --test-level RunLocalTests"
+        "Deploy all custom objects and Apex classes found in all defined package directories (both examples are equivalent):\n<%= config.bin %> <%= command.id %> --metadata CustomObject ApexClass\n<%= config.bin %> <%= command.id %> --metadata CustomObject --metadata ApexClass",
+        "Deploy all Apex classes and a profile that has a space in its name:\n<%= config.bin %> <%= command.id %> --metadata ApexClass --metadata \"Profile:My Profile\"",
+        "Deploy all components listed in a manifest:\n<%= config.bin %> <%= command.id %> --manifest path/to/package.xml",
+        "Run the tests that aren’t in any managed packages as part of a deployment:\n<%= config.bin %> <%= command.id %> --metadata ApexClass --test-level RunLocalTests"
       ],
       "flags": {
         "json": {
@@ -1547,7 +1547,7 @@
           "type": "option"
         },
         "async": {
-          "description": "The command immediately returns the job ID and control of the terminal to you. This way, you can continue to use the CLI. To resume the deployment, run \"sf project deploy resume\". To check the status of the deployment, run \"sf project deploy report\".",
+          "description": "The command immediately returns the job ID and control of the terminal to you. This way, you can continue to use the CLI. To resume the deployment, run \"<%= config.bin %> project deploy resume\". To check the status of the deployment, run \"<%= config.bin %> project deploy report\".",
           "exclusive": [
             "wait"
           ],
@@ -1709,7 +1709,7 @@
         },
         "wait": {
           "char": "w",
-          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you and returns the job ID. To resume the deployment, run \"sf project deploy resume\". To check the status of the deployment, run \"sf project deploy report\".",
+          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you and returns the job ID. To resume the deployment, run \"<%= config.bin %> project deploy resume\". To check the status of the deployment, run \"<%= config.bin %> project deploy report\".",
           "exclusive": [
             "async"
           ],
@@ -1903,13 +1903,13 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "Use this command to verify whether a deployment will succeed without actually deploying the metadata to your org. This command is similar to \"sf project deploy start\", except you're required to run Apex tests, and the command returns a job ID rather than executing the deployment. If the validation succeeds, then you pass this job ID to the \"sf project deploy quick\" command to actually deploy the metadata. This quick deploy takes less time because it skips running Apex tests. The job ID is valid for 10 days from when you started the validation. Validating first is useful if the deployment to your production org take several hours and you don’t want to risk a failed deploy.\n\nYou must run this command from within a project.\n\nThis command doesn't support source-tracking. When you quick deploy with the resulting job ID, the source you deploy overwrites the corresponding metadata in your org.\n\nTo validate the deployment of multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.\n\nNote: Don't use this command on sandboxes; the command is intended to be used on production orgs. By default, sandboxes don't run tests during a deploy. If you want to validate a deployment with tests on a sandbox, use \"sf project deploy start --dry-run --test-level RunLocalTests\" instead.",
+      "description": "Use this command to verify whether a deployment will succeed without actually deploying the metadata to your org. This command is similar to \"<%= config.bin %> project deploy start\", except you're required to run Apex tests, and the command returns a job ID rather than executing the deployment. If the validation succeeds, then you pass this job ID to the \"<%= config.bin %> project deploy quick\" command to actually deploy the metadata. This quick deploy takes less time because it skips running Apex tests. The job ID is valid for 10 days from when you started the validation. Validating first is useful if the deployment to your production org take several hours and you don’t want to risk a failed deploy.\n\nYou must run this command from within a project.\n\nThis command doesn't support source-tracking. When you quick deploy with the resulting job ID, the source you deploy overwrites the corresponding metadata in your org.\n\nTo validate the deployment of multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.\n\nNote: Don't use this command on sandboxes; the command is intended to be used on production orgs. By default, sandboxes don't run tests during a deploy. If you want to validate a deployment with tests on a sandbox, use \"<%= config.bin %> project deploy start --dry-run --test-level RunLocalTests\" instead.",
       "examples": [
-        "NOTE: These examples focus on validating large deployments. See the help for \"sf project deploy start\" for examples of deploying smaller sets of metadata which you can also use to validate.",
-        "Validate the deployment of all source files in the \"force-app\" directory to the default org:\nsf <%= command.id %> --source-dir force-app",
-        "Validate the deployment of all source files in two directories: \"force-app\" and \"force-app-utils\":\nsf <%= command.id %> --source-dir force-app --source-dir force-app-utils",
-        "Asynchronously validate the deployment and run all tests in the org with alias \"my-prod-org\"; command immediately returns the job ID:\nsf <%= command.id %> --source-dir force-app --async --test-level RunAllTestsInOrg --target-org my-prod-org",
-        "Validate the deployment of all components listed in a manifest:\nsf <%= command.id %> --manifest path/to/package.xml"
+        "NOTE: These examples focus on validating large deployments. See the help for \"<%= config.bin %> project deploy start\" for examples of deploying smaller sets of metadata which you can also use to validate.",
+        "Validate the deployment of all source files in the \"force-app\" directory to the default org:\n<%= config.bin %> <%= command.id %> --source-dir force-app",
+        "Validate the deployment of all source files in two directories: \"force-app\" and \"force-app-utils\":\n<%= config.bin %> <%= command.id %> --source-dir force-app --source-dir force-app-utils",
+        "Asynchronously validate the deployment and run all tests in the org with alias \"my-prod-org\"; command immediately returns the job ID:\n<%= config.bin %> <%= command.id %> --source-dir force-app --async --test-level RunAllTestsInOrg --target-org my-prod-org",
+        "Validate the deployment of all components listed in a manifest:\n<%= config.bin %> <%= command.id %> --manifest path/to/package.xml"
       ],
       "flags": {
         "json": {
@@ -1937,7 +1937,7 @@
           "type": "option"
         },
         "async": {
-          "description": "The command immediately returns the job ID and control of the terminal to you. This way, you can continue to use the CLI. To resume watching the validation, run \"sf project deploy resume\". To check the status of the validation, run \"sf project deploy report\".",
+          "description": "The command immediately returns the job ID and control of the terminal to you. This way, you can continue to use the CLI. To resume watching the validation, run \"<%= config.bin %> project deploy resume\". To check the status of the validation, run \"<%= config.bin %> project deploy report\".",
           "name": "async",
           "summary": "Run the command asynchronously.",
           "allowNo": false,
@@ -2046,7 +2046,7 @@
         },
         "wait": {
           "char": "w",
-          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you and returns the job ID. To resume watching the validation, run \"sf project deploy resume\". To check the status of the validation, run \"sf project deploy report\".",
+          "description": "If the command continues to run after the wait period, the CLI returns control of the terminal window to you and returns the job ID. To resume watching the validation, run \"<%= config.bin %> project deploy resume\". To check the status of the validation, run \"<%= config.bin %> project deploy report\".",
           "name": "wait",
           "summary": "Number of minutes to wait for the command to complete and display results.",
           "hasDynamicHelp": true,
@@ -2251,10 +2251,10 @@
       "deprecateAliases": true,
       "description": "Create a manifest from a list of metadata components (--metadata) or from one or more local directories that contain source files (--source-dir). You can specify either of these parameters, not both.\n\nUse --type to specify the type of manifest you want to create. The resulting manifest files have specific names, such as the standard package.xml or destructiveChanges.xml to delete metadata. Valid values for this parameter, and their respective file names, are:\n\n    * package : package.xml (default)\n    * pre : destructiveChangesPre.xml\n    * post : destructiveChangesPost.xml\n    * destroy : destructiveChanges.xml\n\nSee https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_deploy_deleting_files.htm for information about these destructive manifest files.\n\nUse --name to specify a custom name for the generated manifest if the pre-defined ones don’t suit your needs. You can specify either --type or --name, but not both.\n\nTo include multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --include-packages and --source-dir.",
       "examples": [
-        "Create a manifest for deploying or retrieving all Apex classes and custom objects:\n$ sf <%= command.id %> --metadata ApexClass --metadata CustomObject",
-        "Create a manifest for deleting the specified Apex class:\n$ sf <%= command.id %> --metadata ApexClass:MyApexClass --type destroy",
-        "Create a manifest for deploying or retrieving all the metadata components in the specified local directory; name the file myNewManifest.xml:\n$ sf <%= command.id %> --source-dir force-app --name myNewManifest",
-        "Create a manifest from the metadata components in the specified org and include metadata in any unlocked packages:\n$ sf <%= command.id %> --from-org test@myorg.com --include-packages unlocked"
+        "Create a manifest for deploying or retrieving all Apex classes and custom objects:\n$ <%= config.bin %> <%= command.id %> --metadata ApexClass --metadata CustomObject",
+        "Create a manifest for deleting the specified Apex class:\n$ <%= config.bin %> <%= command.id %> --metadata ApexClass:MyApexClass --type destroy",
+        "Create a manifest for deploying or retrieving all the metadata components in the specified local directory; name the file myNewManifest.xml:\n$ <%= config.bin %> <%= command.id %> --source-dir force-app --name myNewManifest",
+        "Create a manifest from the metadata components in the specified org and include metadata in any unlocked packages:\n$ <%= config.bin %> <%= command.id %> --from-org test@myorg.com --include-packages unlocked"
       ],
       "flags": {
         "json": {
@@ -2457,9 +2457,9 @@
       "deprecateAliases": true,
       "description": "When deploying or retrieving metadata between your local project and an org, you can specify the source files you want to exclude with a .forceignore file. The .forceignore file structure mimics the .gitignore structure. Each line in .forceignore specifies a pattern that corresponds to one or more files. The files typically represent metadata components, but can be any files you want to exclude, such as LWC configuration JSON files or tests.",
       "examples": [
-        "List all the files in all package directories that are ignored:\nsf <%= command.id %>",
-        "List all the files in a specific directory that are ignored:\nsf <%= command.id %> --source-dir force-app",
-        "Check if a particular file is ignored:\nsf <%= command.id %> --source-dir package.xml"
+        "List all the files in all package directories that are ignored:\n<%= config.bin %> <%= command.id %>",
+        "List all the files in a specific directory that are ignored:\n<%= config.bin %> <%= command.id %> --source-dir force-app",
+        "Check if a particular file is ignored:\n<%= config.bin %> <%= command.id %> --source-dir package.xml"
       ],
       "flags": {
         "json": {
@@ -2549,10 +2549,10 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "WARNING: This command deletes or overwrites all existing source tracking files. Use with extreme caution.\n\nResets local and remote source tracking so that Salesforce CLI no longer registers differences between your local files and those in the org. When you next run 'project deploy preview', Salesforce CLI returns no results, even though conflicts might actually exist. Salesforce CLI then resumes tracking new source changes as usual.\n\nUse the --revision parameter to reset source tracking to a specific revision number of an org source member. To get the revision number, query the SourceMember Tooling API object with the 'data soql' command. For example:\n\n    sf data query --query \"SELECT MemberName, MemberType, RevisionCounter FROM SourceMember\" --use-tooling-api --target-org my-scratch",
+      "description": "WARNING: This command deletes or overwrites all existing source tracking files. Use with extreme caution.\n\nResets local and remote source tracking so that Salesforce CLI no longer registers differences between your local files and those in the org. When you next run 'project deploy preview', Salesforce CLI returns no results, even though conflicts might actually exist. Salesforce CLI then resumes tracking new source changes as usual.\n\nUse the --revision parameter to reset source tracking to a specific revision number of an org source member. To get the revision number, query the SourceMember Tooling API object with the 'data soql' command. For example:\n\n    <%= config.bin %> data query --query \"SELECT MemberName, MemberType, RevisionCounter FROM SourceMember\" --use-tooling-api --target-org my-scratch",
       "examples": [
-        "Reset source tracking for the org with alias \"my-scratch\":\n$ sf <%= command.id %> --target-org my-scratch",
-        "Reset source tracking to revision number 30 for your default org:\n$ sf <%= command.id %> --revision 30"
+        "Reset source tracking for the org with alias \"my-scratch\":\n$ <%= config.bin %> <%= command.id %> --target-org my-scratch",
+        "Reset source tracking to revision number 30 for your default org:\n$ <%= config.bin %> <%= command.id %> --revision 30"
       ],
       "flags": {
         "json": {
@@ -2685,10 +2685,10 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "You must run this command from within a project.\n\nThe command outputs a table that describes what will happen if you run the \"sf project retrieve start\" command. The table lists the metadata components that will be retrieved and deleted. The table also lists the current conflicts between files in your local project and components in the org. Finally, the table lists the files that won't be retrieved because they're included in your .forceignore file.\n\nIf your org allows source tracking, then this command displays potential conflicts between the org and your local project. Some orgs, such as production org, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"sf org create scratch|sandbox\" commands.",
+      "description": "You must run this command from within a project.\n\nThe command outputs a table that describes what will happen if you run the \"<%= config.bin %> project retrieve start\" command. The table lists the metadata components that will be retrieved and deleted. The table also lists the current conflicts between files in your local project and components in the org. Finally, the table lists the files that won't be retrieved because they're included in your .forceignore file.\n\nIf your org allows source tracking, then this command displays potential conflicts between the org and your local project. Some orgs, such as production org, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"<%= config.bin %> org create scratch|sandbox\" commands.",
       "examples": [
-        "Preview the retrieve of all changes from your default org:\nsf <%= command.id %>",
-        "Preview the retrieve when ignoring any conflicts from an org with alias \"my-scratch\":\nsf <%= command.id %> --ignore-conflicts --target-org my-scratch"
+        "Preview the retrieve of all changes from your default org:\n<%= config.bin %> <%= command.id %>",
+        "Preview the retrieve when ignoring any conflicts from an org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --ignore-conflicts --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -2772,22 +2772,22 @@
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "You must run this command from within a project.\n\nMetadata components are retrieved in source format by default. Retrieve them in metadata format by specifying the --target-metadata-dir flag, which retrieves the components into a ZIP file in the specified directory.\n\nIf your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production orgs, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"sf org create scratch|sandbox\" commands.\n\nTo retrieve multiple metadata components, either use multiple --metadata <name> flags or use a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
+      "description": "You must run this command from within a project.\n\nMetadata components are retrieved in source format by default. Retrieve them in metadata format by specifying the --target-metadata-dir flag, which retrieves the components into a ZIP file in the specified directory.\n\nIf your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production orgs, never allow source tracking. Source tracking is enabled by default on scratch and sandbox orgs; you can disable source tracking when you create the orgs by specifying the --no-track-source flag on the \"<%= config.bin %> org create scratch|sandbox\" commands.\n\nTo retrieve multiple metadata components, either use multiple --metadata <name> flags or use a single --metadata flag with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax applies to --manifest and --source-dir.",
       "examples": [
-        "Retrieve all remote changes from your default org:\nsf <%= command.id %>",
-        "Retrieve the source files in the \"force-app\" directory from an org with alias \"my-scratch\":\nsf <%= command.id %> --source-dir force-app --target-org my-scratch",
-        "Retrieve all the Apex classes and custom objects whose source is in the \"force-app\" directory. The list views, layouts, etc, that are associated with the custom objects are also retrieved. Both examples are equivalent:\nsf <%= command.id %> --source-dir force-app/main/default/classes force-app/main/default/objects\nsf <%= command.id %> --source-dir force-app/main/default/classes --source-dir force-app/main/default/objects",
-        "Retrieve all Apex classes that are in all package directories defined in the \"sfdx-project.json\" file:\nsf <%= command.id %> --metadata ApexClass",
-        "Retrieve a specific Apex class; ignore any conflicts between the local project and org (be careful with this flag, because it will overwrite the Apex class source files in your local project if there are conflicts!):\nsf <%= command.id %> --metadata ApexClass:MyApexClass --ignore-conflicts",
-        "Retrieve specific Apex classes that match a pattern; in this example, retrieve Apex classes whose names contain the string \"MyApex\":\nsf <%= command.id %> --metadata 'ApexClass:MyApex*'",
+        "Retrieve all remote changes from your default org:\n<%= config.bin %> <%= command.id %>",
+        "Retrieve the source files in the \"force-app\" directory from an org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --source-dir force-app --target-org my-scratch",
+        "Retrieve all the Apex classes and custom objects whose source is in the \"force-app\" directory. The list views, layouts, etc, that are associated with the custom objects are also retrieved. Both examples are equivalent:\n<%= config.bin %> <%= command.id %> --source-dir force-app/main/default/classes force-app/main/default/objects\n<%= config.bin %> <%= command.id %> --source-dir force-app/main/default/classes --source-dir force-app/main/default/objects",
+        "Retrieve all Apex classes that are in all package directories defined in the \"sfdx-project.json\" file:\n<%= config.bin %> <%= command.id %> --metadata ApexClass",
+        "Retrieve a specific Apex class; ignore any conflicts between the local project and org (be careful with this flag, because it will overwrite the Apex class source files in your local project if there are conflicts!):\n<%= config.bin %> <%= command.id %> --metadata ApexClass:MyApexClass --ignore-conflicts",
+        "Retrieve specific Apex classes that match a pattern; in this example, retrieve Apex classes whose names contain the string \"MyApex\":\n<%= config.bin %> <%= command.id %> --metadata 'ApexClass:MyApex*'",
         "Retrieve a custom object called ExcitingObject that's in the SBQQ namespace:\nsf <%= command.id %> --metadata CustomObject:SBQQ__ExcitingObject",
         "Retrieve all custom objects in the SBQQ namespace by using a wildcard and quotes:\nsf <%= command.id %> --metadata 'CustomObject:SBQQ__*'",
-        "Retrieve all custom objects and Apex classes found in all defined package directories (both examples are equivalent):\nsf <%= command.id %> --metadata CustomObject ApexClass\nsf <%= command.id %> --metadata CustomObject --metadata ApexClass",
-        "Retrieve all metadata components listed in a manifest:\nsf <%= command.id %> --manifest path/to/package.xml",
-        "Retrieve metadata from a package:\nsf <%= command.id %> --package-name MyPackageName",
-        "Retrieve metadata from multiple packages, one of which has a space in its name (both examples are equivalent):\nsf <%= command.id %> --package-name Package1 \"PackageName With Spaces\" Package3\nsf <%= command.id %> --package-name Package1 --package-name \"PackageName With Spaces\" --package-name Package3",
-        "Retrieve the metadata components listed in the force-app directory, but retrieve them in metadata format into a ZIP file in the \"output\" directory:\nsf <%= command.id %> --source-dir force-app --target-metadata-dir output",
-        "Retrieve in metadata format and automatically extract the contents into the \"output\" directory:\nsf <%= command.id %> --source-dir force-app --target-metadata-dir output --unzip"
+        "Retrieve all custom objects and Apex classes found in all defined package directories (both examples are equivalent):\n<%= config.bin %> <%= command.id %> --metadata CustomObject ApexClass\n<%= config.bin %> <%= command.id %> --metadata CustomObject --metadata ApexClass",
+        "Retrieve all metadata components listed in a manifest:\n<%= config.bin %> <%= command.id %> --manifest path/to/package.xml",
+        "Retrieve metadata from a package:\n<%= config.bin %> <%= command.id %> --package-name MyPackageName",
+        "Retrieve metadata from multiple packages, one of which has a space in its name (both examples are equivalent):\n<%= config.bin %> <%= command.id %> --package-name Package1 \"PackageName With Spaces\" Package3\n<%= config.bin %> <%= command.id %> --package-name Package1 --package-name \"PackageName With Spaces\" --package-name Package3",
+        "Retrieve the metadata components listed in the force-app directory, but retrieve them in metadata format into a ZIP file in the \"output\" directory:\n<%= config.bin %> <%= command.id %> --source-dir force-app --target-metadata-dir output",
+        "Retrieve in metadata format and automatically extract the contents into the \"output\" directory:\n<%= config.bin %> <%= command.id %> --source-dir force-app --target-metadata-dir output --unzip"
       ],
       "flags": {
         "json": {
@@ -3023,5 +3023,5 @@
       ]
     }
   },
-  "version": "3.8.4"
+  "version": "3.9.0"
 }

package/package.json

@@ -1,25 +1,25 @@
 {
     "name": "@salesforce/plugin-deploy-retrieve",
     "description": "deploy and retrieve commands for sf",
-    "version": "3.8.4",
+    "version": "3.9.0",
     "author": "Salesforce",
     "bugs": "https://github.com/forcedotcom/cli/issues",
     "dependencies": {
-        "@oclif/core": "^3.26.6",
+        "@oclif/core": "^4",
         "@salesforce/apex-node": "^6.0.0",
         "@salesforce/core": "^7.3.9",
         "@salesforce/kit": "^3.1.2",
         "@salesforce/plugin-info": "^3.3.4",
-        "@salesforce/sf-plugins-core": "^9.1.0",
-        "@salesforce/source-deploy-retrieve": "^11.6.3",
-        "@salesforce/source-tracking": "^6.3.2",
+        "@salesforce/sf-plugins-core": "^10.0.0",
+        "@salesforce/source-deploy-retrieve": "^11.6.5",
+        "@salesforce/source-tracking": "^6.3.4",
         "@salesforce/ts-types": "^2.0.9",
         "chalk": "^5.3.0"
     },
     "devDependencies": {
         "@oclif/plugin-command-snapshot": "^5.2.0",
         "@salesforce/cli-plugins-testkit": "^5.3.8",
-        "@salesforce/dev-scripts": "^9.1.2",
+        "@salesforce/dev-scripts": "^9.1.3",
         "@salesforce/plugin-command-reference": "^3.0.86",
         "@salesforce/schemas": "^1.9.0",
         "@salesforce/source-testkit": "^2.2.22",
@@ -250,7 +250,7 @@
     "exports": "./lib/index.js",
     "type": "module",
     "sfdx": {
-        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.8.4.crt",
-        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.8.4.sig"
+        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.9.0.crt",
+        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.9.0.sig"
     }
 }