@salesforce/cli 1.69.0 → 1.71.0

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.69.0",
+  "version": "1.71.0",
   "commands": {
     "cmdt:generate:field": {
       "id": "cmdt:generate:field",
@@ -612,8 +612,8 @@
           "char": "p",
           "summary": "URL to append to the domain created when Digital Experiences was enabled for this org.",
           "description": "For example, if your domain name is https://MyDomainName.my.site.com and you create a customer site, enter 'customers' to create the unique URL https://MyDomainName.my.site.com/customers.",
-          "required": true,
           "multiple": false,
+          "default": "",
           "deprecateAliases": true,
           "aliases": [
             "urlpathprefix"
@@ -994,17 +994,953 @@
       },
       "args": {}
     },
-    "dev:convert:messages": {
-      "id": "dev:convert:messages",
-      "summary": "Convert a .json messages file",
-      "strict": true,
-      "pluginName": "@salesforce/plugin-dev",
-      "pluginAlias": "@salesforce/plugin-dev",
+    "dev:convert:messages": {
+      "id": "dev:convert:messages",
+      "summary": "Convert a .json messages file",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-dev",
+      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "<%= config.bin %> <%= command.id %> --filename something.json",
+        "<%= config.bin %> <%= command.id %> --project-dir ./path/to/plugin --filename something.json"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "project-dir": {
+          "name": "project-dir",
+          "type": "option",
+          "char": "p",
+          "summary": "Location of the project whose messages are to be audited.",
+          "description": "Location of the project whose messages are to be audited.",
+          "multiple": false,
+          "default": ".",
+          "aliases": [
+            "projectdir"
+          ]
+        },
+        "file-name": {
+          "name": "file-name",
+          "type": "option",
+          "char": "f",
+          "summary": "Filename to convert",
+          "required": true,
+          "multiple": true,
+          "aliases": [
+            "filename"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "dev:generate:command": {
+      "id": "dev:generate:command",
+      "summary": "Generate a new sf command.",
+      "description": "You must run this command from within a plugin directory, such as the directory created with the \"sf dev generate plugin\" command.\n\nThe command generates basic source files, messages (\\*.md), and test files for your new command.  The Typescript files contain import statements for the minimum required Salesforce libraries, and scaffold some basic code. The new type names come from the value you passed to the --name flag.\n\nThe command updates the package.json file, so if it detects conflicts with the existing file, you're prompted whether you want to overwrite the file. There are a number of package.json updates required for a new command, so we recommend you answer \"y\" so the command takes care of them all. If you answer \"n\", you must update the package.json file manually.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-dev",
+      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Generate the files for a new \"sf my exciting command\":\n<%= config.bin %> <%= command.id %> --name my:exciting:command"
+      ],
+      "flags": {
+        "name": {
+          "name": "name",
+          "type": "option",
+          "char": "n",
+          "summary": "Name of the new command. Use colons to separate the topic and command names.",
+          "required": true,
+          "multiple": false
+        },
+        "force": {
+          "name": "force",
+          "type": "boolean",
+          "summary": "Overwrite existing files.",
+          "allowNo": false
+        },
+        "nuts": {
+          "name": "nuts",
+          "type": "boolean",
+          "summary": "Generate a NUT test file for the command.",
+          "allowNo": true
+        },
+        "unit": {
+          "name": "unit",
+          "type": "boolean",
+          "summary": "Generate a unit test file for the command.",
+          "allowNo": true
+        }
+      },
+      "args": {}
+    },
+    "dev:generate:flag": {
+      "id": "dev:generate:flag",
+      "summary": "Generate a flag for an existing command.",
+      "description": "You must run this command from within a plugin directory, such as the directory created with the \"sf dev generate plugin\" command.\n\nThis command is interactive. It first discovers all the commands currently implemented in the plugin, and asks you which you want to create a new flag for. It then prompts for other flag properties, such as its long name, optional short name, type, whether it's required, and so on. Long flag names must be kebab-case and not camelCase. The command doesn't let you use an existing long or short flag name. When the command completes, the Typescript file for the command is updated with the code for the new flag.\n\nUse the --dry-run flag to review new code for the command file without actually udpating it.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-dev",
+      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Generate a new flag and update the command file:\n<%= config.bin %> <%= command.id %>",
+        "Don't actually update the command file, just view the generated code:\n<%= config.bin %> <%= command.id %> --dry-run"
+      ],
+      "flags": {
+        "dry-run": {
+          "name": "dry-run",
+          "type": "boolean",
+          "char": "d",
+          "summary": "Print new flag code instead of adding it to the command file.",
+          "allowNo": false,
+          "aliases": [
+            "dryrun"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "dev:generate:hook": {
+      "id": "dev:generate:hook",
+      "summary": "Generate a new sf hook.",
+      "description": "You must run this command from within a plugin directory, such as the directory created with the \"sf dev generate plugin\" command.\n\nThe command generates a basic Typescript source file in the \"src/hooks\" directory to get you started. The source file's name is based on the event you're hooking into, such as envList.ts for the \"sf env list\" command.\n\nThe command updates the package.json file, so if it detects conflicts with the existing file, you're prompted whether you want to overwrite the file. There are a number of package.json updates required for a new hook, so we recommend you answer \"y\" so the command takes care of them all. If you answer \"n\", you must update the package.json file manually.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-dev",
+      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Generate source file for a hook into the \"sf env display\" command:\n<%= config.bin %> <%= command.id %> --event sf:env:display"
+      ],
+      "flags": {
+        "force": {
+          "name": "force",
+          "type": "boolean",
+          "summary": "Overwrite existing files.",
+          "allowNo": false
+        },
+        "event": {
+          "name": "event",
+          "type": "option",
+          "summary": "Event to run hook on. Use colons to separate topic and command names of the event.",
+          "required": true,
+          "multiple": false,
+          "options": [
+            "sf:env:list",
+            "sf:env:display",
+            "sf:deploy",
+            "sf:logout"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "dev:generate:library": {
+      "id": "dev:generate:library",
+      "summary": "Generate a new library.",
+      "description": "This command is interactive. You're prompted for information to populate the new library, such as the npm scope (which must start with \"@\"), the name and description of the library, and its GitHub organization. The command clones the 'forcedotcom/library-template' GitHub repository, installs the library's npm package dependencies using yarn install, and updates the package properties.\n\nWhen the command completes, your new library contains a few sample source and test files to get you started.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-dev",
+      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {},
+      "args": {}
+    },
+    "dev:generate:plugin": {
+      "id": "dev:generate:plugin",
+      "summary": "Generate a new sf plugin.",
+      "description": "This command is interactive. You're prompted for information to populate your new plugin, such as its name, description, author, and percentage of code coverage you want. The command clones the 'salesforcecli/plugin-template-sf' GitHub repository, installs the plug-in's npm package dependencies using yarn install, and updates the package properties.\n\nWhen the command completes, your new plugin contains the source, message, and test files for a sample \"sf hello world\" command.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-dev",
+      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginType": "jit",
+      "aliases": [
+        "plugins:generate"
+      ],
+      "examples": [
+        "<%= config.bin %> <%= command.id %>"
+      ],
+      "deprecateAliases": true,
+      "flags": {},
+      "args": {}
+    },
+    "deploy:functions": {
+      "id": "deploy:functions",
+      "summary": "Deploy a Salesforce Function to an org from your local project.",
+      "description": "You must run this command from within a git repository. Only committed changes to Functions are deployed. The active branch is deployed unless specified otherwise with `--branch`.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Deploy a Salesforce Function:\n<%= config.bin %> <%= command.id %> --connected-org org-alias",
+        "Deploy to 'deploy-branch':\n<%= config.bin %> <%= command.id %> --connected-org org-alias --branch deploy-branch",
+        "Overwrite the remote repository:\n<%= config.bin %> <%= command.id %> --connected-org org-alias --force"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "connected-org": {
+          "name": "connected-org",
+          "type": "option",
+          "char": "o",
+          "description": "Username or alias for the org that the compute environment should be connected to.",
+          "required": true,
+          "multiple": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "option",
+          "char": "b",
+          "description": "Deploy the latest commit from a branch different from the currently active branch.",
+          "multiple": false
+        },
+        "force": {
+          "name": "force",
+          "type": "boolean",
+          "description": "Ignore warnings and overwrite remote repository (not allowed in production).",
+          "allowNo": false
+        },
+        "quiet": {
+          "name": "quiet",
+          "type": "boolean",
+          "char": "q",
+          "description": "Limit the amount of output displayed from the deploy process.",
+          "allowNo": false
+        }
+      },
+      "args": {}
+    },
+    "env:delete": {
+      "id": "env:delete",
+      "summary": "Delete an environment.",
+      "description": "You must include the name of the environment to delete using '--target-compute'. Run 'sf env list' to see a list of environments.\n\nRunning this command will prompt a confirmation. If you want to skip this confirmation, use the '--confirm' flag and the environment alias to skip confirmation.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Delete a compute environment:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias",
+        "Delete without a confirmation step:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias --confirm environment-alias"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        },
+        "confirm": {
+          "name": "confirm",
+          "type": "option",
+          "description": "Confirmation name.",
+          "helpValue": "name",
+          "multiple": true
+        }
+      },
+      "args": {}
+    },
+    "env:log": {
+      "id": "env:log",
+      "summary": "Stream log output for an environment.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "state": "beta",
+      "aliases": [],
+      "examples": [
+        "Stream log output:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias"
+      ],
+      "flags": {
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Compute environment name to retrieve logs.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        },
+        "num": {
+          "name": "num",
+          "type": "option",
+          "char": "n",
+          "description": "Number of lines to display.",
+          "multiple": false
+        }
+      },
+      "args": {}
+    },
+    "generate:function": {
+      "id": "generate:function",
+      "summary": "Create a Salesforce Function with basic scaffolding specific to a given language.",
+      "description": "Both '--language' and '--name' are required flags. Function names must start with a capital letter.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Create a JavaScript function:\n<%= config.bin %> <%= command.id %> --function-name myfunction --language javascript"
+      ],
+      "flags": {
+        "function-name": {
+          "name": "function-name",
+          "type": "option",
+          "char": "n",
+          "description": "Function name. Must start with a capital letter.",
+          "multiple": false,
+          "exclusive": [
+            "name"
+          ]
+        },
+        "name": {
+          "name": "name",
+          "type": "option",
+          "char": "n",
+          "description": "Function name. Must start with a capital letter.",
+          "hidden": true,
+          "multiple": false,
+          "exclusive": [
+            "function-name"
+          ]
+        },
+        "language": {
+          "name": "language",
+          "type": "option",
+          "char": "l",
+          "description": "The language in which the function is written.",
+          "required": true,
+          "multiple": false,
+          "options": [
+            "java",
+            "javascript",
+            "python",
+            "typescript"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "login:functions": {
+      "id": "login:functions",
+      "summary": "Log in to Salesforce Functions.",
+      "description": "This step is required to develop or deploy Salesforce Functions.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Log in to Salesforce Functions:\n<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        }
+      },
+      "args": {}
+    },
+    "logout:functions": {
+      "id": "logout:functions",
+      "summary": "Log out of your Salesforce Functions account.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Log out:\n<%= config.bin %> <%= command.id %>"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        }
+      },
+      "args": {}
+    },
+    "run:function": {
+      "id": "run:function",
+      "summary": "Send a cloudevent to a function.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Run a function:\n<%= config.bin %> <%= command.id %> --url http://path/to/function",
+        "Run a function with a payload and a JSON response:\n<%= config.bin %> <%= command.id %> --url http://path/to/function --payload '@file.json' --structured"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "function-url": {
+          "name": "function-url",
+          "type": "option",
+          "char": "l",
+          "description": "URL of the function to run.",
+          "multiple": false,
+          "exclusive": [
+            "url"
+          ]
+        },
+        "url": {
+          "name": "url",
+          "type": "option",
+          "char": "l",
+          "description": "URL of the function to run.",
+          "hidden": true,
+          "multiple": false,
+          "exclusive": [
+            "function-url"
+          ]
+        },
+        "headers": {
+          "name": "headers",
+          "type": "option",
+          "char": "H",
+          "description": "Set headers.",
+          "multiple": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "option",
+          "char": "p",
+          "description": "Set the payload of the cloudevent as a JSON object or a path to a file via @file.json.",
+          "multiple": false
+        },
+        "structured": {
+          "name": "structured",
+          "type": "boolean",
+          "char": "s",
+          "description": "Set the cloudevent to be emitted as a structured JSON cloudevent.",
+          "allowNo": false
+        },
+        "connected-org": {
+          "name": "connected-org",
+          "type": "option",
+          "char": "o",
+          "description": "Username or alias for the target org; overrides default target org.",
+          "multiple": false
+        }
+      },
+      "args": {}
+    },
+    "whoami:functions": {
+      "id": "whoami:functions",
+      "summary": "Show information on your Salesforce Functions login.",
+      "description": "Returns your email and ID. Use '--show-token' to show your Salesforce Functions token.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Get account information:\n<%= config.bin %> <%= command.id %>",
+        "Show token and output result as JSON:\n<%= config.bin %> <%= command.id %> --show-token --json"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "show-token": {
+          "name": "show-token",
+          "type": "boolean",
+          "description": "Show the stored functions token.",
+          "hidden": true,
+          "allowNo": false
+        }
+      },
+      "args": {}
+    },
+    "env:create:compute": {
+      "id": "env:create:compute",
+      "summary": "Create a compute environment for use with Salesforce Functions.",
+      "description": "Compute environments must be connected to a Salesforce org. By default the command uses your local environment's connected org. Use the '--connected-org' flag to specify a specific org. Run 'sf env list' to see a list of environments.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Create a compute environment to run Salesforce Functions:\n<%= config.bin %> <%= command.id %>",
+        "Connect the environment to a specific org:\n<%= config.bin %> <%= command.id %> --connected-org=org-alias",
+        "Create an alias for the compute environment:\n<%= config.bin %> <%= command.id %> --alias environment-alias"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "connected-org": {
+          "name": "connected-org",
+          "type": "option",
+          "char": "o",
+          "description": "Username or alias for the org that the compute environment should be connected to.",
+          "required": false,
+          "multiple": false
+        },
+        "alias": {
+          "name": "alias",
+          "type": "option",
+          "char": "a",
+          "description": "Alias for the created environment.",
+          "multiple": false
+        }
+      },
+      "args": {}
+    },
+    "env:log:tail": {
+      "id": "env:log:tail",
+      "summary": "Stream log output for an environment.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Stream log output:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias"
+      ],
+      "flags": {
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Compute environment name to retrieve logs.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "env:logdrain:add": {
+      "id": "env:logdrain:add",
+      "summary": "Add log drain to a specified environment.",
+      "description": "Both '--target-compute' and '--url' are required flags. '--url' should be a HTTP or HTTPS URL that can receive the log drain messages.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Add a log drain:\n<%= config.bin %> <%= command.id %> --target-compute environment-name --url https://path/to/logdrain"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        },
+        "drain-url": {
+          "name": "drain-url",
+          "type": "option",
+          "char": "l",
+          "description": "Endpoint that will receive sent logs.",
+          "multiple": false,
+          "exclusive": [
+            "url"
+          ]
+        },
+        "url": {
+          "name": "url",
+          "type": "option",
+          "char": "u",
+          "description": "Endpoint that will receive sent logs.",
+          "hidden": true,
+          "multiple": false,
+          "exclusive": [
+            "drain-url"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "env:logdrain:list": {
+      "id": "env:logdrain:list",
+      "summary": "List log drains connected to a specified environment.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "List log drains:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias",
+        "List log drains as json:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias --json"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "env:logdrain:remove": {
+      "id": "env:logdrain:remove",
+      "summary": "Remove log drain from a specified environment.",
+      "description": "Both '--target-compute' and '--drain-url' are required flags.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Remove a logdrain:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias --url https://path/to/logdrain"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        },
+        "drain-url": {
+          "name": "drain-url",
+          "type": "option",
+          "char": "l",
+          "description": "Log drain url to remove.",
+          "multiple": false,
+          "exclusive": [
+            "url"
+          ]
+        },
+        "url": {
+          "name": "url",
+          "type": "option",
+          "char": "u",
+          "description": "Log drain url to remove.",
+          "hidden": true,
+          "multiple": false,
+          "exclusive": [
+            "drain-url"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "env:var:get": {
+      "id": "env:var:get",
+      "summary": "Display a single config variable for an environment.",
+      "description": "You must provide the '--target-compute' flag and the key to retrieve.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Get a config variable:\n<%= config.bin %> <%= command.id %> [KEY] --target-compute environment-alias"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        }
+      },
+      "args": {
+        "key": {
+          "name": "key",
+          "required": true
+        }
+      }
+    },
+    "env:var:list": {
+      "id": "env:var:list",
+      "summary": "List your environment's config vars in a table.",
+      "description": "Use the '--json' flag to return config vars in JSON format.",
+      "strict": true,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "List config vars:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias",
+        "List in JSON format:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias --json"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "env:var:set": {
+      "id": "env:var:set",
+      "summary": "Set a single config value for an environment.",
+      "strict": false,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
+      "pluginType": "jit",
+      "aliases": [],
+      "examples": [
+        "Set a config value:\n<%= config.bin %> <%= command.id %> [KEY]=[VALUE] --target-compute environment-alias"
+      ],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "target-compute": {
+          "name": "target-compute",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "environment"
+          ]
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
+          ]
+        }
+      },
+      "args": {}
+    },
+    "env:var:unset": {
+      "id": "env:var:unset",
+      "summary": "Unset a single config value for an environment.",
+      "description": "Run 'sf env var list' to see a list of config values that can be unset.",
+      "strict": false,
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
       "pluginType": "jit",
       "aliases": [],
       "examples": [
-        "<%= config.bin %> <%= command.id %> --filename something.json",
-        "<%= config.bin %> <%= command.id %> --project-dir ./path/to/plugin --filename something.json"
+        "Unset a value:\n<%= config.bin %> <%= command.id %> --target-compute environment-alias"
       ],
       "flags": {
         "json": {
@@ -1014,167 +1950,271 @@
           "helpGroup": "GLOBAL",
           "allowNo": false
         },
-        "project-dir": {
-          "name": "project-dir",
+        "target-compute": {
+          "name": "target-compute",
           "type": "option",
-          "char": "p",
-          "summary": "Location of the project whose messages are to be audited.",
-          "description": "Location of the project whose messages are to be audited.",
+          "char": "e",
+          "description": "Environment name.",
+          "required": false,
           "multiple": false,
-          "default": ".",
-          "aliases": [
-            "projectdir"
+          "exclusive": [
+            "environment"
           ]
         },
-        "file-name": {
-          "name": "file-name",
+        "environment": {
+          "name": "environment",
           "type": "option",
-          "char": "f",
-          "summary": "Filename to convert",
-          "required": true,
-          "multiple": true,
-          "aliases": [
-            "filename"
+          "char": "e",
+          "description": "Environment name.",
+          "hidden": true,
+          "required": false,
+          "multiple": false,
+          "exclusive": [
+            "target-compute"
           ]
         }
       },
       "args": {}
     },
-    "dev:generate:command": {
-      "id": "dev:generate:command",
-      "summary": "Generate a new sf command.",
-      "description": "You must run this command from within a plugin directory, such as the directory created with the \"sf dev generate plugin\" command.\n\nThe command generates basic source files, messages (\\*.md), and test files for your new command.  The Typescript files contain import statements for the minimum required Salesforce libraries, and scaffold some basic code. The new type names come from the value you passed to the --name flag.\n\nThe command updates the package.json file, so if it detects conflicts with the existing file, you're prompted whether you want to overwrite the file. There are a number of package.json updates required for a new command, so we recommend you answer \"y\" so the command takes care of them all. If you answer \"n\", you must update the package.json file manually.",
+    "login:functions:jwt": {
+      "id": "login:functions:jwt",
+      "summary": "Login using JWT instead of default web-based flow. This will authenticate you with both sf and Salesforce Functions.",
+      "description": "Use this command when executing from a script.",
       "strict": true,
-      "pluginName": "@salesforce/plugin-dev",
-      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
       "pluginType": "jit",
       "aliases": [],
       "examples": [
-        "Generate the files for a new \"sf my exciting command\":\n<%= config.bin %> <%= command.id %> --name my:exciting:command"
+        "Log in using JWT:\n<%= config.bin %> <%= command.id %> --username example@username.org --keyfile file.key --clientid 123456",
+        "Log in and specify the org alias and URL, set as default org and default Dev Hub, and format output as JSON:\n<%= config.bin %> <%= command.id %> --username example@username.org --keyfile file.key --clientid 123456 --alias org-alias --set-default --set-default-dev-hub --instance-url https://path/to/instance --json"
       ],
       "flags": {
-        "name": {
-          "name": "name",
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "allowNo": false
+        },
+        "username": {
+          "name": "username",
           "type": "option",
-          "char": "n",
-          "summary": "Name of the new command. Use colons to separate the topic and command names.",
+          "char": "u",
+          "description": "Authentication username.",
           "required": true,
           "multiple": false
         },
-        "force": {
-          "name": "force",
-          "type": "boolean",
-          "summary": "Overwrite existing files.",
-          "allowNo": false
+        "keyfile": {
+          "name": "keyfile",
+          "type": "option",
+          "char": "f",
+          "description": "Path to JWT keyfile.",
+          "required": true,
+          "multiple": false
         },
-        "nuts": {
-          "name": "nuts",
+        "clientid": {
+          "name": "clientid",
+          "type": "option",
+          "char": "i",
+          "description": "OAuth client ID.",
+          "required": true,
+          "multiple": false
+        },
+        "instance-url": {
+          "name": "instance-url",
+          "type": "option",
+          "char": "l",
+          "description": "The login URL of the instance the org lives on.",
+          "multiple": false,
+          "exclusive": [
+            "instanceurl"
+          ]
+        },
+        "instanceurl": {
+          "name": "instanceurl",
+          "type": "option",
+          "char": "l",
+          "description": "The login URL of the instance the org lives on.",
+          "hidden": true,
+          "multiple": false,
+          "exclusive": [
+            "instance-url"
+          ]
+        },
+        "alias": {
+          "name": "alias",
+          "type": "option",
+          "char": "a",
+          "description": "Alias for the org.",
+          "multiple": false
+        },
+        "set-default": {
+          "name": "set-default",
           "type": "boolean",
-          "summary": "Generate a NUT test file for the command.",
-          "allowNo": true
+          "char": "d",
+          "description": "Set the org as the default that all org-related commands run against.",
+          "allowNo": false
         },
-        "unit": {
-          "name": "unit",
+        "set-default-dev-hub": {
+          "name": "set-default-dev-hub",
           "type": "boolean",
-          "summary": "Generate a unit test file for the command.",
-          "allowNo": true
+          "char": "v",
+          "description": "Set the org as the default Dev Hub for scratch org creation.",
+          "allowNo": false
         }
       },
       "args": {}
     },
-    "dev:generate:flag": {
-      "id": "dev:generate:flag",
-      "summary": "Generate a flag for an existing command.",
-      "description": "You must run this command from within a plugin directory, such as the directory created with the \"sf dev generate plugin\" command.\n\nThis command is interactive. It first discovers all the commands currently implemented in the plugin, and asks you which you want to create a new flag for. It then prompts for other flag properties, such as its long name, optional short name, type, whether it's required, and so on. Long flag names must be kebab-case and not camelCase. The command doesn't let you use an existing long or short flag name. When the command completes, the Typescript file for the command is updated with the code for the new flag.\n\nUse the --dry-run flag to review new code for the command file without actually udpating it.",
+    "run:function:start": {
+      "id": "run:function:start",
+      "summary": "Build and run a Salesforce Function.",
+      "description": "Run this command from the directory of your Salesforce Functions project.\n\nThis command will run the target function locally (on the same operating system as this CLI), just like the `local` subcommand.",
       "strict": true,
-      "pluginName": "@salesforce/plugin-dev",
-      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
       "pluginType": "jit",
       "aliases": [],
       "examples": [
-        "Generate a new flag and update the command file:\n<%= config.bin %> <%= command.id %>",
-        "Don't actually update the command file, just view the generated code:\n<%= config.bin %> <%= command.id %> --dry-run"
+        "Build a function and start the invoker\n<%= config.bin %> <%= command.id %>",
+        "Start the invoker with a specific language and port\n<%= config.bin %> <%= command.id %> --port 5000 --language javascript"
       ],
       "flags": {
-        "dry-run": {
-          "name": "dry-run",
+        "path": {
+          "name": "path",
+          "type": "option",
+          "description": "Path to function directory.",
+          "hidden": true,
+          "multiple": false,
+          "default": "/home/runner/work/cli/cli"
+        },
+        "port": {
+          "name": "port",
+          "type": "option",
+          "char": "p",
+          "description": "Port for running the function.",
+          "multiple": false,
+          "default": 8080
+        },
+        "debug-port": {
+          "name": "debug-port",
+          "type": "option",
+          "char": "b",
+          "description": "Port for remote debugging.",
+          "multiple": false,
+          "default": 9229
+        },
+        "language": {
+          "name": "language",
+          "type": "option",
+          "char": "l",
+          "description": "The language that the function runs in.",
+          "multiple": false,
+          "options": [
+            "auto",
+            "java",
+            "javascript",
+            "python",
+            "typescript"
+          ],
+          "default": "auto"
+        },
+        "verbose": {
+          "name": "verbose",
           "type": "boolean",
-          "char": "d",
-          "summary": "Print new flag code instead of adding it to the command file.",
-          "allowNo": false,
-          "aliases": [
-            "dryrun"
-          ]
+          "char": "v",
+          "description": "Output additional logs.",
+          "allowNo": false
         }
       },
       "args": {}
     },
-    "dev:generate:hook": {
-      "id": "dev:generate:hook",
-      "summary": "Generate a new sf hook.",
-      "description": "You must run this command from within a plugin directory, such as the directory created with the \"sf dev generate plugin\" command.\n\nThe command generates a basic Typescript source file in the \"src/hooks\" directory to get you started. The source file's name is based on the event you're hooking into, such as envList.ts for the \"sf env list\" command.\n\nThe command updates the package.json file, so if it detects conflicts with the existing file, you're prompted whether you want to overwrite the file. There are a number of package.json updates required for a new hook, so we recommend you answer \"y\" so the command takes care of them all. If you answer \"n\", you must update the package.json file manually.",
+    "env:compute:collaborator:add": {
+      "id": "env:compute:collaborator:add",
+      "summary": "Add a Heroku user as a collaborator on this Functions account, allowing them to attach Heroku add-ons to compute environments.",
       "strict": true,
-      "pluginName": "@salesforce/plugin-dev",
-      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
       "pluginType": "jit",
       "aliases": [],
       "examples": [
-        "Generate source file for a hook into the \"sf env display\" command:\n<%= config.bin %> <%= command.id %> --event sf:env:display"
+        "Add a Heroku user as a collaborator on this Functions account.\n<%= config.bin %> <%= command.id %> --heroku-user example@heroku.com"
       ],
       "flags": {
-        "force": {
-          "name": "force",
-          "type": "boolean",
-          "summary": "Overwrite existing files.",
-          "allowNo": false
-        },
-        "event": {
-          "name": "event",
+        "heroku-user": {
+          "name": "heroku-user",
           "type": "option",
-          "summary": "Event to run hook on. Use colons to separate topic and command names of the event.",
+          "char": "h",
+          "description": "Email address of the Heroku user you're adding as a collaborator.",
           "required": true,
-          "multiple": false,
-          "options": [
-            "sf:env:list",
-            "sf:env:display",
-            "sf:deploy",
-            "sf:logout"
-          ]
+          "multiple": false
         }
       },
       "args": {}
     },
-    "dev:generate:library": {
-      "id": "dev:generate:library",
-      "summary": "Generate a new library.",
-      "description": "This command is interactive. You're prompted for information to populate the new library, such as the npm scope (which must start with \"@\"), the name and description of the library, and its GitHub organization. The command clones the 'forcedotcom/library-template' GitHub repository, installs the library's npm package dependencies using yarn install, and updates the package properties.\n\nWhen the command completes, your new library contains a few sample source and test files to get you started.",
+    "run:function:start:container": {
+      "id": "run:function:start:container",
       "strict": true,
-      "pluginName": "@salesforce/plugin-dev",
-      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
       "pluginType": "jit",
       "aliases": [],
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
       "flags": {},
       "args": {}
     },
-    "dev:generate:plugin": {
-      "id": "dev:generate:plugin",
-      "summary": "Generate a new sf plugin.",
-      "description": "This command is interactive. You're prompted for information to populate your new plugin, such as its name, description, author, and percentage of code coverage you want. The command clones the 'salesforcecli/plugin-template-sf' GitHub repository, installs the plug-in's npm package dependencies using yarn install, and updates the package properties.\n\nWhen the command completes, your new plugin contains the source, message, and test files for a sample \"sf hello world\" command.",
+    "run:function:start:local": {
+      "id": "run:function:start:local",
+      "description": "Build and run a Salesforce Function locally.",
       "strict": true,
-      "pluginName": "@salesforce/plugin-dev",
-      "pluginAlias": "@salesforce/plugin-dev",
+      "pluginName": "@salesforce/plugin-functions",
+      "pluginAlias": "@salesforce/plugin-functions",
       "pluginType": "jit",
-      "aliases": [
-        "plugins:generate"
-      ],
+      "aliases": [],
       "examples": [
-        "<%= config.bin %> <%= command.id %>"
+        "Build a function and start the invoker\n<%= config.bin %> <%= command.id %>",
+        "Start the invoker with a specific language and port\n<%= config.bin %> <%= command.id %> --port 5000 --language javascript"
       ],
-      "deprecateAliases": true,
-      "flags": {},
+      "flags": {
+        "path": {
+          "name": "path",
+          "type": "option",
+          "description": "Path to function directory.",
+          "hidden": true,
+          "multiple": false,
+          "default": "/home/runner/work/cli/cli"
+        },
+        "port": {
+          "name": "port",
+          "type": "option",
+          "char": "p",
+          "description": "Port to bind the invoker to.",
+          "multiple": false,
+          "default": 8080
+        },
+        "debug-port": {
+          "name": "debug-port",
+          "type": "option",
+          "char": "b",
+          "description": "Port to use for debugging the function.",
+          "multiple": false,
+          "default": 9229
+        },
+        "language": {
+          "name": "language",
+          "type": "option",
+          "char": "l",
+          "description": "The language in which the function is written.",
+          "multiple": false,
+          "options": [
+            "auto",
+            "java",
+            "javascript",
+            "python",
+            "typescript"
+          ],
+          "default": "auto"
+        }
+      },
       "args": {}
     },
     "package:convert": {
@@ -1192,7 +2232,7 @@
       ],
       "examples": [
         "Create a second-generation package version from the first-generation package with the specified ID and give it the installation key \"password123\"; uses your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 033... --installation-key password123",
-        "Similar to previous example, but uses the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 033... --installation-key password123 --target-hub-org devhuborg@example.com"
+        "Similar to previous example, but uses the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 033... --installation-key password123 --target-dev-hub devhuborg@example.com"
       ],
       "deprecateAliases": true,
       "flags": {
@@ -1214,8 +2254,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -1223,7 +2263,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -1263,7 +2304,6 @@
           "char": "f",
           "summary": "Path to a definition file that contains features and org preferences that the metadata of the package version depends on.",
           "description": "This definition file is similar to the scratch org definition file.",
-          "hidden": true,
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
@@ -1333,7 +2373,7 @@
       ],
       "examples": [
         "Create an unlocked package from the files in the \"force-app\" directory; uses your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --name MyUnlockedPackage --package-type Unlocked --path force-app",
-        "Create a managed packaged from the \"force-app\" directory files, give the package a description, and use the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --name MyManagedPackage --description \"Your Package Descripton\" --package-type Managed --path force-app --target-hub-org devhub@example.com"
+        "Create a managed packaged from the \"force-app\" directory files, give the package a description, and use the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --name MyManagedPackage --description \"Your Package Descripton\" --package-type Managed --path force-app --target-dev-hub devhub@example.com"
       ],
       "deprecateAliases": true,
       "flags": {
@@ -1355,8 +2395,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -1364,7 +2404,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -1474,7 +2515,7 @@
       ],
       "examples": [
         "Delete a package using its alias from your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package \"Your Package Alias\"",
-        "Delete a package using its ID from the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 0Ho... --target-hub-org devhub@example.com"
+        "Delete a package using its ID from the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 0Ho... --target-dev-hub devhub@example.com"
       ],
       "deprecateAliases": true,
       "flags": {
@@ -1496,8 +2537,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -1505,7 +2546,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -1752,8 +2794,8 @@
         "force:package:list"
       ],
       "examples": [
-        "List all packages in the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --target-hub-org devhub@example.com",
-        "List all packages details in the specified Dev Hub org, and show extended details about each package:\n<%= config.bin %> <%= command.id %> --target-hub-org devhub@example.com --verbose"
+        "List all packages in the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --target-dev-hub devhub@example.com",
+        "List all packages details in the specified Dev Hub org, and show extended details about each package:\n<%= config.bin %> <%= command.id %> --target-dev-hub devhub@example.com --verbose"
       ],
       "deprecateAliases": true,
       "flags": {
@@ -1775,8 +2817,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -1784,7 +2826,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -1908,7 +2951,7 @@
       ],
       "examples": [
         "Update the name of the package with the specified alias; uses your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package \"Your Package Alias\" --name \"New Package Name\"",
-        "Update the description of the package with the specified ID; uses the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 0Ho... --description \"New Package Description\" --target-hub-org devhub@example.com"
+        "Update the description of the package with the specified ID; uses the specified Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 0Ho... --description \"New Package Description\" --target-dev-hub devhub@example.com"
       ],
       "deprecateAliases": true,
       "flags": {
@@ -1930,8 +2973,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -1939,7 +2982,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -2219,7 +3263,7 @@
       ],
       "examples": [
         "Create a package version from the contents of the \"common\" directory and give it an installation key of \"password123\"; uses your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --path common --installation-key password123",
-        "Create a package version from a package with the specified alias; uses the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package \"Your Package Alias\" --installation-key password123 --target-hub-org devhub@example.com",
+        "Create a package version from a package with the specified alias; uses the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package \"Your Package Alias\" --installation-key password123 --target-dev-hub devhub@example.com",
         "Create a package version from a package with the specified ID:\n<%= config.bin %> <%= command.id %> --package 0Ho... --installation-key password123",
         "Create a package version and skip the validation step:\n<%= config.bin %> <%= command.id %> --path common --installation-key password123 --skip-validation"
       ],
@@ -2243,8 +3287,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -2252,7 +3296,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -2549,8 +3594,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -2558,7 +3603,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -2618,7 +3664,7 @@
       "examples": [
         "Display the ancestry tree for a package version with the specified alias, using your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package package_version_alias",
         "Similar to previous example, but display the output in DOT code:\n<%= config.bin %> <%= command.id %> --package package_version_alias --dot-code",
-        "Display the ancestry tree for a package with the specified ID, using the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package OHo... --target-hub-org devhub@example.com",
+        "Display the ancestry tree for a package with the specified ID, using the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package OHo... --target-dev-hub devhub@example.com",
         "Display the ancestry tree of a package version with the specified ID, using your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 04t..."
       ],
       "deprecateAliases": true,
@@ -2641,8 +3687,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -2650,7 +3696,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -2710,7 +3757,7 @@
       ],
       "examples": [
         "List package versions in your default Dev Hub org that were created in the last 3 days; show only the released versions and order the list using the PatchVersion field. Display extended details about each package version:\n<%= config.bin %> <%= command.id %> --verbose --created-last-days 3 --released --order-by PatchVersion",
-        "List the released package versions for the two specified packages that were modified today; use the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --packages 0Ho000000000000,0Ho000000000001 --released --modified-last-days 0 --target-hub-org devhub@example.com",
+        "List the released package versions for the two specified packages that were modified today; use the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --packages 0Ho000000000000,0Ho000000000001 --released --modified-last-days 0 --target-dev-hub devhub@example.com",
         "List all released package versions in your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --released",
         "List package versions that were modified today in your default Dev Hub org; show limited details about each one:\n<%= config.bin %> <%= command.id %> --concise --modified-last-days 0",
         "List released package versions that were created in the last 3 days in your default Dev Hub org; show limited details:\n<%= config.bin %> <%= command.id %> --concise --created-last-days 3 --released",
@@ -2736,8 +3783,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -2745,7 +3792,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -2839,7 +3887,7 @@
       ],
       "examples": [
         "Promote the package version with the specified ID to released; uses your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 04t...",
-        "Promote the package version with the specified alias to released; uses the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package awesome_package_alias --target-hub-org devhub@example.com",
+        "Promote the package version with the specified alias to released; uses the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package awesome_package_alias --target-dev-hub devhub@example.com",
         "Promote the package version with an alias that has spaces to released:\n<%= config.bin %> <%= command.id %> --package \"Awesome Package Alias\""
       ],
       "deprecateAliases": true,
@@ -2862,8 +3910,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -2871,7 +3919,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -2923,7 +3972,7 @@
       ],
       "examples": [
         "Retrieve details about the package version with the specified ID from your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package 04t...",
-        "Retrieve details about the package version with the specified alias (that contains spaces) from the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package \"Your Package Alias\" --target-hub-org devhub@example.com"
+        "Retrieve details about the package version with the specified alias (that contains spaces) from the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package \"Your Package Alias\" --target-dev-hub devhub@example.com"
       ],
       "deprecateAliases": true,
       "flags": {
@@ -2945,8 +3994,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -2954,7 +4003,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -3002,7 +4052,7 @@
       ],
       "examples": [
         "Update the package version that has the specified alias (that contains spaces) with a new installation key \"password123\"; uses your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package \"Your Package Alias\" --installation-key password123",
-        "Update the package version that has the specified ID with a new branch and tag; use the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package 04t... --branch main --tag 'Release 1.0.7' --target-hub-org devhub@example.com",
+        "Update the package version that has the specified ID with a new branch and tag; use the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package 04t... --branch main --tag 'Release 1.0.7' --target-dev-hub devhub@example.com",
         "Update the package version that has the specified ID with a new description:\n<%= config.bin %> <%= command.id %> --package 04t... --version-description \"New Package Version Description\""
       ],
       "deprecateAliases": true,
@@ -3025,8 +4075,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -3034,7 +4084,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -3428,7 +4479,7 @@
       ],
       "examples": [
         "List all package version creation requests in your default Dev Hub org:\n<%= config.bin %> <%= command.id %>",
-        "List package version creation requests from the last 3 days in the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --created-last-days 3 --target-hub-org",
+        "List package version creation requests from the last 3 days in the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --created-last-days 3 --target-dev-hub",
         "List package version creation requests with status Error:\n<%= config.bin %> <%= command.id %> --status Error",
         "List package version creation requests with status InProgress:\n<%= config.bin %> <%= command.id %> --status InProgress",
         "List package version creation requests with status Success that were created today:\n<%= config.bin %> <%= command.id %> --created-last-days 0 --status Success"
@@ -3453,8 +4504,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -3462,7 +4513,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {
@@ -3518,7 +4570,7 @@
       ],
       "examples": [
         "Retrieve details about the package version creation request with the specified ID; uses your default Dev Hub org:\n<%= config.bin %> <%= command.id %> --package-create-request-id 08c...",
-        "Retrieve details about the specified package version creation request in the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package-create-request-id 08c... --target-hub-org devhub@example.com"
+        "Retrieve details about the specified package version creation request in the Dev Hub org with username devhub@example.com:\n<%= config.bin %> <%= command.id %> --package-create-request-id 08c... --target-dev-hub devhub@example.com"
       ],
       "deprecateAliases": true,
       "flags": {
@@ -3540,8 +4592,8 @@
           },
           "deprecateAliases": true
         },
-        "target-hub-org": {
-          "name": "target-hub-org",
+        "target-dev-hub": {
+          "name": "target-dev-hub",
           "type": "option",
           "char": "v",
           "summary": "Username or alias of the Dev Hub org.",
@@ -3549,7 +4601,8 @@
           "multiple": false,
           "deprecateAliases": true,
           "aliases": [
-            "targetdevhubusername"
+            "targetdevhubusername",
+            "target-hub-org"
           ]
         },
         "api-version": {