@salesforce/cli 1.25.1 → 1.27.0

package/README.md

@@ -31,7 +31,7 @@ $ npm install -g @salesforce/cli
 $ sf COMMAND
 running command...
 $ sf (--version|-v)
-@salesforce/cli/1.25.1 linux-x64 node-v14.19.1
+@salesforce/cli/1.27.0 linux-x64 node-v14.19.2
 $ sf --help [COMMAND]
 USAGE
   $ sf COMMAND
@@ -52,17 +52,27 @@ USAGE
 - [`sf deploy`](#sf-deploy)
 - [`sf deploy functions`](#sf-deploy-functions)
 - [`sf deploy metadata`](#sf-deploy-metadata)
+- [`sf deploy metadata cancel`](#sf-deploy-metadata-cancel)
+- [`sf deploy metadata quick`](#sf-deploy-metadata-quick)
+- [`sf deploy metadata report`](#sf-deploy-metadata-report)
+- [`sf deploy metadata resume`](#sf-deploy-metadata-resume)
+- [`sf deploy metadata validate`](#sf-deploy-metadata-validate)
 - [`sf env compute collaborator add`](#sf-env-compute-collaborator-add)
 - [`sf env create compute`](#sf-env-create-compute)
+- [`sf env create sandbox`](#sf-env-create-sandbox)
+- [`sf env create scratch`](#sf-env-create-scratch)
 - [`sf env delete`](#sf-env-delete)
+- [`sf env delete sandbox`](#sf-env-delete-sandbox)
+- [`sf env delete scratch`](#sf-env-delete-scratch)
 - [`sf env display`](#sf-env-display)
 - [`sf env list`](#sf-env-list)
-- [`sf env log`](#sf-env-log)
 - [`sf env log tail`](#sf-env-log-tail)
 - [`sf env logdrain add`](#sf-env-logdrain-add)
 - [`sf env logdrain list`](#sf-env-logdrain-list)
 - [`sf env logdrain remove`](#sf-env-logdrain-remove)
 - [`sf env open`](#sf-env-open)
+- [`sf env resume sandbox`](#sf-env-resume-sandbox)
+- [`sf env resume scratch`](#sf-env-resume-scratch)
 - [`sf env var get KEY`](#sf-env-var-get-key)
 - [`sf env var list`](#sf-env-var-list)
 - [`sf env var set`](#sf-env-var-set)
@@ -125,7 +135,7 @@ EXAMPLES
   $ sf autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.2.0/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.0/src/commands/autocomplete/index.ts)_
 
 ## `sf config get`
 
@@ -328,7 +338,7 @@ EXAMPLES
     $ sf deploy --interactive
 ```
 
-_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/v1.3.0/src/commands/deploy.ts)_
+_See code: [@salesforce/plugin-deploy-retrieve](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/v1.4.2/src/commands/deploy.ts)_
 
 ## `sf deploy functions`
 
@@ -350,8 +360,9 @@ Deploy metadata in source format to an org from your local project.
 
 ```
 USAGE
-  $ sf deploy metadata [--json] [-a <value>] [--dry-run] [-r] [-g] [-x <value>] [-m <value>] [-d <value>] [-o
-    <value>] [-t <value>] [-l NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg] [--verbose] [-w <value>]
+  $ sf deploy metadata [--json] [-a <value>] [--async | -w <value>] [--concise | --verbose] [--dry-run] [-r] [-g] [-x
+    <value>] [-m <value>] [-d <value>] [-o <value>] [-t <value>] [-l
+    NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg]
 
 FLAGS
   -a, --api-version=<value>    Target API version for the deploy.
@@ -366,6 +377,8 @@ FLAGS
   -w, --wait=<minutes>         [default: [object Object]] Number of minutes to wait for command to complete and display
                                results.
   -x, --manifest=<value>       Full file path for manifest (package.xml) of components to deploy.
+  --async                      Run the command asynchronously.
+  --concise                    Show concise output of the deploy result.
   --dry-run                    Validate deploy and run Apex tests but don’t save to the org.
   --verbose                    Show verbose output of the deploy result.
 
@@ -380,9 +393,6 @@ DESCRIPTION
   This 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.
 
-  To run the command asynchronously, set --wait to 0, which immediately returns the job ID. This way, you can continue
-  to use the CLI.
-
   To 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.
@@ -479,19 +489,439 @@ FLAG DESCRIPTIONS
 
   -w, --wait=<minutes>  Number of minutes to wait for command to complete and display results.
 
-    If the command continues to run after the wait period, the CLI returns control of the terminal window to you.
+    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 deploy metadata resume". To check the status of the
+    deployment, run "sf deploy metadata report".
 
   -x, --manifest=<value>  Full file path for manifest (package.xml) of components to deploy.
 
     All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
 
+  --async  Run the command asynchronously.
+
+    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 deploy metadata resume". To check the status of the deployment, run "sf
+    deploy metadata report".
+
+CONFIGURATION VARIABLES
+  target-org       Username or alias of the org that all commands run against by default. (sf only)
+  org-api-version  API version of your project. Default: API version of your Dev Hub org.
+
+ENVIRONMENT VARIABLES
+  SF_TARGET_ORG        Username or alias of your default org. Overrides the target-org configuration variable.
+  SF_USE_PROGRESS_BAR  Set to false to disable the progress bar when running the metadata deploy command.
+
+ERROR CODES
+  Succeeded (0)          The deploy succeeded.
+  Canceled (1)           The deploy was canceled.
+  Failed (1)             The deploy failed.
+  SucceededPartial (68)  The deploy partially succeeded.
+  InProgress (69)        The deploy is in progress.
+  Pending (69)           The deploy is pending.
+  Canceling (69)         The deploy is being canceled.
+```
+
+## `sf deploy metadata cancel`
+
+Cancel a deploy operation.
+
+```
+USAGE
+  $ sf deploy metadata cancel [--json] [--async | -w <value>] [-i <value>] [-r]
+
+FLAGS
+  -i, --job-id=<value>   Job ID of the deploy operation you want to cancel.
+  -r, --use-most-recent  Use the job ID of the most recent deploy operation.
+  -w, --wait=<minutes>   Number of minutes to wait for the command to complete and display results.
+  --async                Run the command asynchronously.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Cancel a deploy operation.
+
+  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.
+
+  Run 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:
+
+    $ sf deploy metadata cancel --job-id 0Af0x000017yLUFCA2
+
+  Cancel the most recent deploy operation:
+
+    $ sf deploy metadata cancel --use-most-recent
+
+FLAG DESCRIPTIONS
+  -i, --job-id=<value>  Job ID of the deploy operation you want to cancel.
+
+    These commands return a job ID if they time out or you specified the --async flag:
+
+    - sf deploy metadata
+    - sf deploy metadata validate
+    - sf deploy metadata quick
+    - sf deploy metadata cancel
+
+    The job ID is valid for 10 days from when you started the deploy operation.
+
+  -r, --use-most-recent  Use the job ID of the most recent deploy operation.
+
+    For performance reasons, this flag uses job IDs for deploy operations that started only in the past 3 days or less.
+    If your most recent deploy operations was more than 3 days ago, this flag won't find a job ID.
+
+  -w, --wait=<minutes>  Number of minutes to wait for the command to complete and display results.
+
+    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 deploy metadata resume". To check the status of the cancellation, run "sf
+    deploy metadata report".
+
+  --async  Run the command asynchronously.
+
+    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 deploy metadata resume". To check the status of the cancellation, run "sf
+    deploy metadata report".
+```
+
+## `sf deploy metadata quick`
+
+Quickly deploy a validated deployment to an org.
+
+```
+USAGE
+  $ sf deploy metadata quick [--json] [--async | -w <value>] [--concise | --verbose] [-i <value>] [-o <value>] [-r]
+
+FLAGS
+  -i, --job-id=<value>      Job ID of the deployment you want to quick deploy.
+  -o, --target-org=<value>  Login username or alias for the target org.
+  -r, --use-most-recent     Use the job ID of the most recently validated deployment.
+  -w, --wait=<minutes>      [default: [object Object]] Number of minutes to wait for the command to complete and display
+                            results.
+  --async                   Run the command asynchronously.
+  --concise                 Show concise output of the deploy result.
+  --verbose                 Show verbose output of the deploy result.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Quickly deploy a validated deployment to an org.
+
+  Before you run this command, first create a validated deployment with the "sf deploy metadata 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.
+
+  Executing 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.
+
+  This 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.
+
+EXAMPLES
+  Run a quick deploy to your default org using a job ID:
+
+    $ sf deploy metadata quick --job-id 0Af0x000017yLUFCA2
+
+  Asynchronously run a quick deploy of the most recently validated deployment to an org with alias "my-prod-org":
+
+    $ sf deploy metadata quick --async --use-most-recent --target-org my-prod-org
+
+FLAG DESCRIPTIONS
+  -i, --job-id=<value>  Job ID of the deployment you want to quick deploy.
+
+    The job ID is valid for 10 days from when you started the validation.
+
+  -o, --target-org=<value>  Login username or alias for the target org.
+
+    Overrides your default org.
+
+  -r, --use-most-recent  Use the job ID of the most recently validated deployment.
+
+    For performance reasons, this flag uses only job IDs that were validated in the past 3 days or less. If your most
+    recent deployment validation was more than 3 days ago, this flag won't find a job ID.
+
+  -w, --wait=<minutes>  Number of minutes to wait for the command to complete and display results.
+
+    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 deploy metadata resume". To check the status of the deploy, run "sf deploy
+    metadata report".
+
+  --async  Run the command asynchronously.
+
+    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 deploy metadata resume". To check the status of the deploy, run "sf deploy
+    metadata report".
+
+ERROR CODES
+  Succeeded (0)          The deploy succeeded.
+  Canceled (1)           The deploy was canceled.
+  Failed (1)             The deploy failed.
+  SucceededPartial (68)  The deploy partially succeeded.
+  InProgress (69)        The deploy is in progress.
+  Pending (69)           The deploy is pending.
+  Canceling (69)         The deploy is being canceled.
+```
+
+## `sf deploy metadata report`
+
+Check the status of a deploy operation.
+
+```
+USAGE
+  $ sf deploy metadata report [--json] [-i <value>] [-r]
+
+FLAGS
+  -i, --job-id=<value>   Job ID of the deploy operation you want to check the status of.
+  -r, --use-most-recent  Use the job ID of the most recent deploy operation.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Check the status of a deploy operation.
+
+  Deploy operations include standard deploys, quick deploys, deploy validations, and deploy cancellations.
+
+  Run 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
+  Check the status using a job ID:
+
+    $ sf deploy metadata report --job-id 0Af0x000017yLUFCA2
+
+  Check the status of the most recent deploy operation:
+
+    $ sf deploy metadata report --use-most-recent
+
+FLAG DESCRIPTIONS
+  -i, --job-id=<value>  Job ID of the deploy operation you want to check the status of.
+
+    These commands return a job ID if they time out or you specified the --async flag:
+
+    - sf deploy metadata
+    - sf deploy metadata validate
+    - sf deploy metadata quick
+    - sf deploy metadata cancel
+
+    The job ID is valid for 10 days from when you started the deploy operation.
+
+  -r, --use-most-recent  Use the job ID of the most recent deploy operation.
+
+    For performance reasons, this flag uses job IDs for deploy operations that started only in the past 3 days or less.
+    If your most recent operation was more than 3 days ago, this flag won't find a job ID.
+```
+
+## `sf deploy metadata resume`
+
+Resume watching a deploy operation.
+
+```
+USAGE
+  $ sf deploy metadata resume [--json] [--concise | --verbose] [-i <value>] [-r] [-w <value>]
+
+FLAGS
+  -i, --job-id=<value>   Job ID of the deploy operation you want to resume.
+  -r, --use-most-recent  Use the job ID of the most recent deploy operation.
+  -w, --wait=<minutes>   Number of minutes to wait for the command to complete and display results.
+  --concise              Show concise output of the deploy operation result.
+  --verbose              Show verbose output of the deploy operation result.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Resume watching a deploy operation.
+
+  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.
+
+  Run 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:
+
+    $ sf deploy metadata resume --job-id 0Af0x000017yLUFCA2
+
+  Resume watching the most recent deploy operation:
+
+    $ sf deploy metadata resume --use-most-recent
+
+FLAG DESCRIPTIONS
+  -i, --job-id=<value>  Job ID of the deploy operation you want to resume.
+
+    These commands return a job ID if they time out or you specified the --async flag:
+
+    - sf deploy metadata
+    - sf deploy metadata validate
+    - sf deploy metadata quick
+    - sf deploy metadata cancel
+
+    The job ID is valid for 10 days from when you started the deploy operation.
+
+  -r, --use-most-recent  Use the job ID of the most recent deploy operation.
+
+    For performance reasons, this flag uses job IDs for deploy operations that started only in the past 3 days or less.
+    If your most recent operation was more than 3 days ago, this flag won't find a job ID.
+
+  -w, --wait=<minutes>  Number of minutes to wait for the command to complete and display results.
+
+    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
+    deploy metadata report".
+
+ENVIRONMENT VARIABLES
+  SF_USE_PROGRESS_BAR  Set to false to disable the progress bar when running the metadata deploy command.
+
+ERROR CODES
+  Succeeded (0)          The deploy succeeded.
+  Canceled (1)           The deploy was canceled.
+  Failed (1)             The deploy failed.
+  SucceededPartial (68)  The deploy partially succeeded.
+  InProgress (69)        The deploy is in progress.
+  Pending (69)           The deploy is pending.
+  Canceling (69)         The deploy is being canceled.
+```
+
+## `sf deploy metadata validate`
+
+Validate a metadata deployment without actually executing it.
+
+```
+USAGE
+  $ sf deploy metadata validate [--json] [-a <value>] [--async] [--concise | --verbose] [-x <value> | -m <value> | -d <value>]
+    [-o <value>] [-t <value>] [-l RunAllTestsInOrg|RunLocalTests|RunSpecifiedTests] [-w <value>]
+
+FLAGS
+  -a, --api-version=<value>    Target API version for the validation.
+  -d, --source-dir=<value>...  Path to the local source files to validate for deployment.
+  -l, --test-level=<option>    [default: RunLocalTests] Deployment Apex testing level.
+                               <options: RunAllTestsInOrg|RunLocalTests|RunSpecifiedTests>
+  -m, --metadata=<value>...    Metadata component names to validate for deployment.
+  -o, --target-org=<value>     Login username or alias for the target org.
+  -t, --tests=<value>...       Apex tests to run when --test-level is RunSpecifiedTests.
+  -w, --wait=<minutes>         [default: [object Object]] Number of minutes to wait for the command to complete and
+                               display results.
+  -x, --manifest=<value>       Full file path for manifest (package.xml) of components to validate for deployment.
+  --async                      Run the command asynchronously.
+  --concise                    Show concise output of the validation result.
+  --verbose                    Show verbose output of the validation result.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Validate a metadata deployment without actually executing it.
+
+  Use this command to verify whether a deployment will succeed without actually deploying the metadata to your org. This
+  command is similar to "sf deploy metadata", 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 deploy metadata
+  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.
+
+  You must run this command from within a project.
+
+  This 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.
+
+  To 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.
+
+EXAMPLES
+  NOTE: These examples focus on validating large deployments.  See the help for "sf deploy metadata" for examples of deploying smaller sets of metadata which you can also use to validate.
+
+  Validate the deployment of all source files in a directory to the default org:
+
+    $ sf deploy metadata validate --source-dir path/to/source
+
+  Asynchronously validate the deployment and run all tests in the org with alias "my-prod-org"; command immediately
+  returns the job ID:
+
+    $ sf deploy metadata validate --source-dir path/to/source --async --test-level RunAllTestsInOrg --target-org \
+      my-prod-org
+
+  Validate the deployment of all components listed in a manifest:
+
+    $ sf deploy metadata validate --manifest path/to/package.xml
+
+FLAG DESCRIPTIONS
+  -a, --api-version=<value>  Target API version for the validation.
+
+    Use this flag to override the default API version, which is the latest version supported the CLI, with the API
+    version in your package.xml file.
+
+  -d, --source-dir=<value>...  Path to the local source files to validate for deployment.
+
+    The supplied path can be to a single file (in which case the operation is applied to only one file) or to a folder
+    (in which case the operation is applied to all metadata types in the directory and its subdirectories).
+
+    If you specify this flag, don’t specify --metadata or --manifest.
+
+  -l, --test-level=RunAllTestsInOrg|RunLocalTests|RunSpecifiedTests  Deployment Apex testing level.
+
+    Valid values are:
+
+    - RunSpecifiedTests — Runs only the tests that you specify with the --run-tests flag. Code coverage requirements
+    differ from the default coverage requirements when using this test level. Executed tests must comprise a minimum of
+    75% code coverage for each class and trigger in the deployment package. This coverage is computed for each class and
+    trigger individually and is different than the overall coverage percentage.
+
+    - RunLocalTests — All tests in your org are run, except the ones that originate from installed managed and unlocked
+    packages. This test level is the default for production deployments that include Apex classes or triggers.
+
+    - RunAllTestsInOrg — All tests in your org are run, including tests of managed packages.
+
+    If you don’t specify a test level, the default behavior depends on the contents of your deployment package. For more
+    information, see [Running Tests in a
+    Deployment](https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_deploy_running_tests.htm)
+    in the "Metadata API Developer Guide".
+
+  -o, --target-org=<value>  Login username or alias for the target org.
+
+    Overrides your default org.
+
+  -w, --wait=<minutes>  Number of minutes to wait for the command to complete and display results.
+
+    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 deploy metadata resume". To check the status of the
+    validation, run "sf deploy metadata report".
+
+  -x, --manifest=<value>  Full file path for manifest (package.xml) of components to validate for deployment.
+
+    All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
+
+  --async  Run the command asynchronously.
+
+    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 deploy metadata resume". To check the status of the validation, run
+    "sf deploy metadata report".
+
 CONFIGURATION VARIABLES
-  target-org  Username or alias of the org that all commands run against by default. (sf only)
-  apiVersion  API version of your project. Default: API version of your Dev Hub org. (sfdx only)
+  target-org       Username or alias of the org that all commands run against by default. (sf only)
+  org-api-version  API version of your project. Default: API version of your Dev Hub org.
 
 ENVIRONMENT VARIABLES
   SF_TARGET_ORG        Username or alias of your default org. Overrides the target-org configuration variable.
   SF_USE_PROGRESS_BAR  Set to false to disable the progress bar when running the metadata deploy command.
+
+ERROR CODES
+  Succeeded (0)          The deploy succeeded.
+  Canceled (1)           The deploy was canceled.
+  Failed (1)             The deploy failed.
+  SucceededPartial (68)  The deploy partially succeeded.
+  InProgress (69)        The deploy is in progress.
+  Pending (69)           The deploy is pending.
+  Canceling (69)         The deploy is being canceled.
 ```
 
 ## `sf env compute collaborator add`
@@ -517,7 +947,7 @@ Create a compute environment for use with Salesforce Functions.
 
 ```
 USAGE
-  $ sf env create compute [-o <value>] [-a <value>]
+  $ sf env create compute [-o <value>] [-a <value> | ]
 
 FLAGS
   -a, --alias=<value>          Alias for the created environment.
@@ -544,6 +974,184 @@ EXAMPLES
     $ sf env create compute --alias environment-alias
 ```
 
+## `sf env create sandbox`
+
+Create a sandbox org.
+
+```
+USAGE
+  $ sf env create sandbox [--json] [-f <value> | -n <value> | -l Developer|Developer_Pro|Partial|Full] [-s] [-a <value>]
+    [-w <value> | --async] [-i <value> | ] [-c <value> | ] [-o <value>] [--no-prompt]
+
+FLAGS
+  -a, --alias=<value>                                        Alias for the sandbox org.
+  -c, --clone=<value>                                        Name of the sandbox org to clone.
+  -f, --definition-file=<value>                              Path to a sandbox definition file.
+  -i, --poll-interval=<seconds>                              [default: [object Object]] Number of seconds to wait
+                                                             between retries.
+  -l, --license-type=(Developer|Developer_Pro|Partial|Full)  [default: Developer] Type of sandbox license.
+  -n, --name=<value>                                         Name of the sandbox org.
+  -o, --target-org=<value>                                   Username or alias of the production org that contains the
+                                                             sandbox license.
+  -s, --set-default                                          Set the sandbox org as your default org.
+  -w, --wait=<minutes>                                       [default: [object Object]] Number of minutes to wait for
+                                                             the sandbox org to be ready.
+  --async                                                    Request the sandbox creation, but don't wait for it to
+                                                             complete.
+  --no-prompt                                                Don't prompt for confirmation about the sandbox
+                                                             configuration.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Create a sandbox org.
+
+  There are two ways to create a sandbox org: specify a definition file that contains the sandbox options or use the
+  --name and --license-type flags to specify the two required options. If you want to set an option other than name or
+  license type, such as apexClassId, you must use a definition file.
+
+EXAMPLES
+  Create a sandbox org using a definition file and give it the alias "MyDevSandbox". The production org that contains
+  the sandbox license has the alias "prodOrg".
+
+    $ sf env create sandbox -f config/dev-sandbox-def.json --alias MyDevSandbox --target-org prodOrg
+
+  Create a sandbox org by directly specifying its name and type of license (Developer) instead of using a definition
+  file. Set the sandbox org as your default.
+
+    $ sf env create sandbox --name mysandbox --license-type Developer --alias MyDevSandbox --target-org prodOrg \
+      --set-default
+
+FLAG DESCRIPTIONS
+  -a, --alias=<value>  Alias for the sandbox org.
+
+    When you create a sandbox, the generated usernames are based on the usernames present in the production org. To
+    ensure uniqueness, the new usernames are appended with the name of the sandbox. For example, the username
+    "user@example.com" in the production org results in the username "user@example.com.mysandbox" in a sandbox named
+    "mysandbox". When you set an alias for a sandbox org, it's assigned to the resulting username of the user running
+    this command.
+
+  -c, --clone=<value>  Name of the sandbox org to clone.
+
+    The value of clone must be an existing sandbox in the same target-org.
+
+  -f, --definition-file=<value>  Path to a sandbox definition file.
+
+    The sandbox definition file is a blueprint for the sandbox. You can create different definition files for each
+    sandbox type that you use in the development process. See
+    https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_sandbox_definition.htm for all the
+    options you can specify in the defintion file.
+
+  -n, --name=<value>  Name of the sandbox org.
+
+    The name must be a unique alphanumeric string (10 or fewer characters) to identify the sandbox. You can’t reuse a
+    name while a sandbox is in the process of being deleted.
+
+  -o, --target-org=<value>  Username or alias of the production org that contains the sandbox license.
+
+    When it creates the sandbox org, Salesforce copies the metadata, and optionally data, from your production org to
+    the new sandbox org.
+
+  -w, --wait=<minutes>  Number of minutes to wait for the sandbox org to be ready.
+
+    If the command continues to run after the wait period, the CLI returns control of the terminal to you and displays
+    the "sf env resume sandbox" command you run to check the status of the create. The displayed command includes the
+    job ID for the running sandbox creation.
+
+  --async  Request the sandbox creation, but don't wait for it to complete.
+
+    The command immediately displays the job ID and returns control of the terminal to you. This way, you can continue
+    to use the CLI. To check the status of the sandbox creation, run "sf env resume sandbox".
+```
+
+## `sf env create scratch`
+
+Create a scratch org.
+
+```
+USAGE
+  $ sf env create scratch [--json] [-a <value>] [--async] [-d] [-f <value>] [-v <value>] [-c] [-e
+    developer|enterprise|group|professional|partner-developer|partner-enterprise|partner-group|partner-professional]
+    [-m] [-y <value>] [-w <value>] [--api-version <value>] [-i <value>]
+
+FLAGS
+  -a, --alias=<value>            Alias for the scratch org.
+  -d, --set-default              Set the scratch org as your default org
+  -e, --edition=<option>         Salesforce edition of the scratch org.
+                                 <options: developer|enterprise|group|professional|partner-developer|partner-enterprise|
+                                 partner-group|partner-professional>
+  -f, --definition-file=<value>  Path to a scratch org definition file.
+  -i, --client-id=<value>        Consumer key of the Dev Hub connected app.
+  -v, --target-dev-hub=<value>   Username or alias of the Dev Hub org.
+  -w, --wait=<minutes>           [default: [object Object]] Number of minutes to wait for the scratch org to be ready.
+  -y, --duration-days=<days>     [default: [object Object]] Number of days before the org expires.
+  --api-version=<value>          Override the api version used for api requests made by this command
+  --async                        Request the org, but don't wait for it to complete.
+
+PACKAGING FLAGS
+  -c, --no-ancestors  Don't include second-generation managed package (2GP) ancestors in the scratch org.
+  -m, --no-namespace  Create the scratch org with no namespace, even if the Dev Hub has a namespace.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Create a scratch org.
+
+  There are two ways to create a scratch org: specify a definition file that contains the options or use the --edition
+  flag to specify the one required option. If you want to set options other than the edition, such as org features or
+  settings, you must use a definition file.
+
+  You must specify a Dev Hub to create a scratch org, either with the --target-dev-hub flag or by setting your default
+  Dev Hub with the target-dev-hub configuration variable.
+
+EXAMPLES
+  Create a Developer edition scratch org using your default Dev Hub and give the scratch org an alias:
+
+    $ sf env create scratch --edition=developer --alias my-scratch-org
+
+  Specify the Dev Hub using its alias and a scratch org definition file. Set the scratch org as your default and
+  specify that it expires in 3 days:
+
+    $ sf env create scratch --target-dev-hub=MyHub --definition-file config/project-scratch-def.json --set-default \
+      --duration-days 3
+
+FLAG DESCRIPTIONS
+  -a, --alias=<value>  Alias for the scratch org.
+
+    New scratch orgs include one administrator by default. The admin user's username is auto-generated and looks
+    something like test-wvkpnfm5z113@example.com. When you set an alias for a new scratch org, it's assigned this
+    username.
+
+  -e, --edition=developer|enterprise|group|professional|partner-developer|partner-enterprise|partner-group|partner-professional
+
+    Salesforce edition of the scratch org.
+
+    The editions that begin with "partner-" are available only if the Dev Hub org is a Partner Business Org.
+
+  -f, --definition-file=<value>  Path to a scratch org definition file.
+
+    The scratch org definition file is a blueprint for the scratch org. It mimics the shape of an org that you use in
+    the development life cycle, such as acceptance testing, packaging, or production. See
+    <https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_scratch_orgs_def_file.htm> for
+    all the option you can specify in the definition file.
+
+  -v, --target-dev-hub=<value>  Username or alias of the Dev Hub org.
+
+    Overrides the value of the target-dev-hub configuration variable, if set.
+
+  -w, --wait=<minutes>  Number of minutes to wait for the scratch org to be ready.
+
+    If the command continues to run after the wait period, the CLI returns control of the terminal to you and displays
+    the job ID. To resume the scratch org creation, run the env resume scratch command and pass it the job ID.
+
+  --async  Request the org, but don't wait for it to complete.
+
+    The command immediately displays the job ID and returns control of the terminal to you. This way, you can continue
+    to use the CLI. To resume the scratch org creation, run "sf env resume scratch".
+```
+
 ## `sf env delete`
 
 Delete an environment.
@@ -575,6 +1183,77 @@ EXAMPLES
     $ sf env delete --target-compute environment-alias --confirm environment-alias
 ```
 
+## `sf env delete sandbox`
+
+Delete a sandbox.
+
+```
+USAGE
+  $ sf env delete sandbox [--json] [-o <value>] [-p]
+
+FLAGS
+  -o, --target-org=<value>  Sandbox alias or login user.
+  -p, --no-prompt           Don't prompt the user to confirm the deletion.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Delete a sandbox.
+
+  Specify a sandbox with either the username you used when you logged into it with "sf login", or the alias you gave the
+  sandbox when you created it. Run "sf env list" to view all your environments, including sandboxes, and their aliases.
+
+EXAMPLES
+  Delete a sandbox with alias my-sandbox:
+
+    $ sf env delete sandbox --target-org=my-sandbox
+
+  Specify a username instead of an alias:
+
+    $ sf env delete sandbox --target-org=myusername@example.com.qa
+
+  Delete the sandbox without prompting to confirm :
+
+    $ sf env delete sandbox --target-org=my-sandbox --no-prompt
+```
+
+## `sf env delete scratch`
+
+Delete a scratch org.
+
+```
+USAGE
+  $ sf env delete scratch [--json] [-o <value>] [-p]
+
+FLAGS
+  -o, --target-org=<value>  Scratch org alias or login user.
+  -p, --no-prompt           Don't prompt the user to confirm the deletion.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Delete a scratch org.
+
+  Specify a scratch org with either the username you used when you logged into it with "sf login", or the alias you gave
+  the scratch org when you created it. Run "sf env list" to view all your environments, including scratch orgs, and
+  their aliases.
+
+EXAMPLES
+  Delete a scratch org with alias my-scratch-org:
+
+    $ sf env delete scratch --target-org=my-scratch-org
+
+  Specify a username instead of an alias:
+
+    $ sf env delete scratch --target-org=test-123456-abcdefg@example.com
+
+  Delete the scratch org without prompting to confirm :
+
+    $ sf env delete scratch --target-org=my-scratch-org --no-prompt
+```
+
 ## `sf env display`
 
 Display details about an environment.
@@ -684,24 +1363,6 @@ EXAMPLES
     $ sf env list --csv --no-header
 ```
 
-## `sf env log`
-
-Stream log output for an environment.
-
-```
-USAGE
-  $ sf env log [-e <value> | ] [-n <value>]
-
-FLAGS
-  -e, --target-compute=<value>  Compute environment name to retrieve logs.
-  -n, --num=<value>             Number of lines to display.
-
-EXAMPLES
-  Stream log output:
-
-    $ sf env log --target-compute environment-alias
-```
-
 ## `sf env log tail`
 
 Stream log output for an environment.
@@ -845,6 +1506,104 @@ FLAG DESCRIPTIONS
     browser applications differ depending on the operating system you're on; check your documentation for details.
 ```
 
+## `sf env resume sandbox`
+
+Check the status of a sandbox creation, and log in to it if it's ready.
+
+```
+USAGE
+  $ sf env resume sandbox [--json] [-w <value>] [-n <value> | -i <value>] [-l] [-o <value>]
+
+FLAGS
+  -i, --job-id=<value>      Job ID of the incomplete sandbox creation that you want to check the status of.
+  -l, --use-most-recent     Use the most recent sandbox create request.
+  -n, --name=<value>        Name of the sandbox org.
+  -o, --target-org=<value>  Username or alias of the production org that contains the sandbox license.
+  -w, --wait=<minutes>      Number of minutes to wait for the sandbox org to be ready.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Check the status of a sandbox creation, and log in to it if it's ready.
+
+  Sandbox creation can take a long time. If the original "sf env create sandbox" command either times out, or you
+  specified the --async flag, the command displays a job ID. Use this job ID to check whether the sandbox creation is
+  complete, and if it is, the command then logs into it.
+
+  You can also use the sandbox name to check the status or the --use-most-recent flag to use the job ID of the most
+  recent sandbox creation.
+
+EXAMPLES
+  Check the status of a sandbox creation using its name and specify a production org with alias "prodOrg":
+
+    $ sf env resume sandbox --name mysandbox --target-org prodOrg
+
+  Check the status using the job ID:
+
+    $ sf env resume sandbox --job-id 0GRxxxxxxxx
+
+  Check the status of the most recent sandbox create request:
+
+    $ sf env resume sandbox --use-most-recent
+
+FLAG DESCRIPTIONS
+  -i, --job-id=<value>  Job ID of the incomplete sandbox creation that you want to check the status of.
+
+    The job ID is valid for 24 hours after you start the sandbox creation.
+
+  -o, --target-org=<value>  Username or alias of the production org that contains the sandbox license.
+
+    When it creates the sandbox org, Salesforce copies the metadata, and optionally data, from your production org to
+    the new sandbox org.
+
+  -w, --wait=<minutes>  Number of minutes to wait for the sandbox org to be ready.
+
+    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 checking the sandbox creation, rerun this command.
+```
+
+## `sf env resume scratch`
+
+Resume the creation of an incomplete scratch org.
+
+```
+USAGE
+  $ sf env resume scratch [--json] [-i <value>] [-r]
+
+FLAGS
+  -i, --job-id=<value>   Job ID of the incomplete scratch org create that you want to resume.
+  -r, --use-most-recent  Use the job ID of the most recent incomplete scratch org.
+
+GLOBAL FLAGS
+  --json  Format output as json.
+
+DESCRIPTION
+  Resume the creation of an incomplete scratch org.
+
+  When the original "sf env create scratch" command either times out or is run with the --async flag, it displays a job
+  ID.
+
+  Run this command by either passing it a job ID or using the --use-most-recent flag to specify the most recent
+  incomplete scratch org.
+
+EXAMPLES
+  Resume a scratch org create with a job ID:
+
+    $ sf env resume scratch --job-id 2SR3u0000008fBDGAY
+
+  Resume your most recent incomplete scratch org:
+
+    $ sf env resume scratch --use-most-recent
+
+FLAG DESCRIPTIONS
+  -i, --job-id=<value>  Job ID of the incomplete scratch org create that you want to resume.
+
+    The job ID is the same as the record ID of the incomplete scratch org in the ScratchOrgInfo object of the Dev Hub.
+
+    The job ID is valid for 24 hours after you start the scratch org creation.
+```
+
 ## `sf env var get KEY`
 
 Display a single config variable for an environment.
@@ -1784,14 +2543,12 @@ FLAG DESCRIPTIONS
     If you specify this parameter, don’t specify --metadata or --source-dir.
 
 CONFIGURATION VARIABLES
-  target-org  Username or alias of the org that all commands run against by default. (sf only)
-  apiVersion  API version of your project. Default: API version of your Dev Hub org. (sfdx only)
+  target-org       Username or alias of the org that all commands run against by default. (sf only)
+  org-api-version  API version of your project. Default: API version of your Dev Hub org.
 
 ENVIRONMENT VARIABLES
-  SF_TARGET_ORG          Username or alias of your default org. Overrides the target-org configuration variable.
-  SFDX_DEFAULTUSERNAME   Username or alias of your default org. Overrides the defaultusername configuration value.
-  SFDX_USE_PROGRESS_BAR  Set to false to disable the progress bar when running force:mdapi:deploy, force:source:deploy,
-                         or force:source:push.
+  SF_TARGET_ORG        Username or alias of your default org. Overrides the target-org configuration variable.
+  SF_USE_PROGRESS_BAR  Set to false to disable the progress bar when running the metadata deploy command.
 ```
 
 ## `sf run function`