@salesforce/plugin-data 4.0.86 → 4.0.87

package/oclif.manifest.json

@@ -735,13 +735,13 @@
         "record:create:data"
       ]
     },
-    "data:delete:bulk": {
+    "data:export:bulk": {
       "aliases": [],
       "args": {},
-      "description": "The CSV file must have only one column (\"Id\") and then the list of record IDs you want to delete, one ID per line.\n\nWhen you execute this command, it starts a job, displays the ID, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job ID to check the status of the job with the \"<%= config.bin %> data delete resume\" command.",
+      "description": "You can use this command to export millions of records from an org, either to migrate data or to back it up.\n\nUse a SOQL query to specify the fields of a standard or custom object that you want to export. Specify the SOQL query either at the command line with the --query flag or read it from a file with the --query-file flag; you can't specify both flags. The --output-file flag is required, which means you can only write the records to a file, in either CSV or JSON format.\n\nBulk exports can take a while, depending on how many records are returned by the SOQL query. If the command times out, the command displays the job ID. To see the status and get the results of the job, run \"sf data export resume\" and pass the job ID to the --job-id flag.\n\nIMPORTANT: This command uses Bulk API 2.0, which limits the type of SOQL queries you can run. For example, you can't use aggregate functions such as count(). For the complete list of limitations, see the \"SOQL Considerations\" section in the \"Bulk API 2.0 and Bulk API Developer Guide\" (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/queries.htm).",
       "examples": [
-        "Bulk delete Account records from your default org using the list of IDs in the \"files/delete.csv\" file:\n<%= config.bin %> <%= command.id %> --sobject Account --file files/delete.csv",
-        "Bulk delete records from a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch"
+        "Export the Id, Name, and Account.Name fields of the Contact object into a CSV-formatted file; if the export doesn't complete in 10 minutes, the command ends and displays a job ID. Use the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.csv --wait 10 --target-org my-scratch",
+        "Similar to previous example, but use the default org, export the records into a JSON-formatted file, and include records that have been soft deleted:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.json --result-format json --wait 10 --all-rows"
       ],
       "flags": {
         "json": {
@@ -760,12 +760,7 @@
           "type": "option"
         },
         "target-org": {
-          "aliases": [
-            "targetusername",
-            "u"
-          ],
           "char": "o",
-          "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
           "required": true,
@@ -775,122 +770,228 @@
           "type": "option"
         },
         "api-version": {
-          "aliases": [
-            "apiversion"
-          ],
-          "deprecateAliases": true,
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "loglevel": {
-          "deprecated": {
-            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
-          },
-          "hidden": true,
-          "name": "loglevel",
+        "wait": {
+          "char": "w",
+          "name": "wait",
+          "summary": "Time to wait for the command to finish, in minutes.",
+          "hasDynamicHelp": true,
+          "helpValue": "<minutes>",
+          "multiple": false,
+          "type": "option"
+        },
+        "query": {
+          "char": "q",
+          "exclusive": [
+            "query-file"
+          ],
+          "name": "query",
+          "summary": "SOQL query to execute.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "file": {
-          "aliases": [
-            "csvfile"
+        "query-file": {
+          "exclusive": [
+            "query"
           ],
-          "char": "f",
-          "deprecateAliases": true,
-          "name": "file",
+          "name": "query-file",
+          "summary": "File that contains the SOQL query.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "all-rows": {
+          "name": "all-rows",
+          "summary": "Include records that have been soft-deleted due to a merge or delete. By default, deleted records are not returned.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "output-file": {
+          "name": "output-file",
           "required": true,
-          "summary": "CSV file that contains the IDs of the records to update or delete.",
+          "summary": "File where records are written.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "sobject": {
-          "aliases": [
-            "sobjecttype"
-          ],
-          "char": "s",
-          "deprecateAliases": true,
-          "name": "sobject",
+        "result-format": {
+          "char": "r",
+          "name": "result-format",
           "required": true,
-          "summary": "API name of the Salesforce object, either standard or custom, that you want to update or delete records from.",
+          "summary": "Format to write the results.",
+          "default": "csv",
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "csv",
+            "json"
+          ],
           "type": "option"
         },
-        "wait": {
-          "char": "w",
-          "name": "wait",
-          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
-          "default": "0 minutes",
-          "hasDynamicHelp": true,
+        "column-delimiter": {
+          "name": "column-delimiter",
+          "relationships": [
+            {
+              "type": "some",
+              "flags": [
+                {
+                  "name": "result-format"
+                }
+              ]
+            }
+          ],
+          "summary": "Column delimiter to be used when writing CSV output. Default is COMMA.",
+          "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "BACKQUOTE",
+            "CARET",
+            "COMMA",
+            "PIPE",
+            "SEMICOLON",
+            "TAB"
+          ],
           "type": "option"
         },
         "line-ending": {
-          "dependsOn": [
-            "file"
-          ],
           "name": "line-ending",
-          "summary": "Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and Linux it's `LF`.",
+          "relationships": [
+            {
+              "type": "some",
+              "flags": [
+                {
+                  "name": "result-format"
+                }
+              ]
+            }
+          ],
+          "summary": "Line ending to be used when writing CSV output. Default value on Windows is is `CRLF`; on macOS and Linux it's `LR`.",
           "hasDynamicHelp": false,
           "multiple": false,
           "options": [
-            "CRLF",
-            "LF"
+            "LF",
+            "CRLF"
           ],
           "type": "option"
+        }
+      },
+      "hasDynamicHelp": true,
+      "hiddenAliases": [],
+      "id": "data:export:bulk",
+      "pluginAlias": "@salesforce/plugin-data",
+      "pluginName": "@salesforce/plugin-data",
+      "pluginType": "core",
+      "strict": true,
+      "summary": "Bulk export records from an org into a file using a SOQL query. Uses Bulk API 2.0.",
+      "enableJsonFlag": true,
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "data",
+        "export",
+        "bulk.js"
+      ],
+      "aliasPermutations": [],
+      "permutations": [
+        "data:export:bulk",
+        "export:data:bulk",
+        "export:bulk:data",
+        "data:bulk:export",
+        "bulk:data:export",
+        "bulk:export:data"
+      ]
+    },
+    "data:export:resume": {
+      "aliases": [],
+      "args": {},
+      "description": "When the original \"data export bulk\" command times out, it displays a job ID. To see the status and get the results of the bulk export, run this command by either passing it the job ID or using the --use-most-recent flag to specify the most recent bulk export job.\n\nUsing either `--job-id` or `--use-most-recent` will properly resolve to the correct org where the bulk job was started based on the cached data by \"data export bulk\".",
+      "examples": [
+        "Resume a bulk export job run by specifying a job ID:\nsf <%= command.id %> --job-id 750xx000000005sAAA",
+        "Resume the most recently-run bulk export job:\nsf data export resume --use-most-recent"
+      ],
+      "flags": {
+        "json": {
+          "description": "Format output as json.",
+          "helpGroup": "GLOBAL",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "hard-delete": {
-          "description": "You must have the \"Bulk API Hard Delete\" system permission to use this flag. The permission is disabled by default and can be enabled only by a system administrator.",
-          "name": "hard-delete",
-          "summary": "Mark the records as immediately eligible for deletion by your org. If you don't specify this flag, the deleted records go into the Recycle Bin.",
+        "flags-dir": {
+          "helpGroup": "GLOBAL",
+          "name": "flags-dir",
+          "summary": "Import flag values from a directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "job-id": {
+          "char": "i",
+          "name": "job-id",
+          "summary": "Job ID of the bulk export.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "use-most-recent": {
+          "name": "use-most-recent",
+          "summary": "Use the job ID of the bulk export job that was most recently run.",
           "allowNo": false,
           "type": "boolean"
+        },
+        "api-version": {
+          "description": "Override the api version used for api requests made by this command",
+          "name": "api-version",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
-      "hasDynamicHelp": true,
+      "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "data:delete:bulk",
+      "id": "data:export:resume",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Bulk delete records from an org using a CSV file. Uses Bulk API 2.0.",
+      "summary": "Resume a bulk export job that you previously started. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "delete",
-        "bulk.js"
+        "export",
+        "resume.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:delete:bulk",
-        "delete:data:bulk",
-        "delete:bulk:data",
-        "data:bulk:delete",
-        "bulk:data:delete",
-        "bulk:delete:data"
+        "data:export:resume",
+        "export:data:resume",
+        "export:resume:data",
+        "data:resume:export",
+        "resume:data:export",
+        "resume:export:data"
       ]
     },
-    "data:delete:record": {
+    "data:export:tree": {
       "aliases": [
-        "force:data:record:delete"
+        "force:data:tree:export"
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "Specify the record you want to delete with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the delete fails; the error displays how many records were found.\n\nWhen specifying field-value pairs, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThis command deletes a record from Salesforce objects by default. Use the --use-tooling-api flag to delete from a Tooling API object.",
+      "description": "Specify a SOQL query, either directly at the command line or read from a file, to retrieve the data you want to export. The exported data is written to JSON files in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use these JSON files to import data into an org with the \"<%= config.bin %> data import tree\" command.\n\nIf your SOQL query references multiple objects, the command generates a single JSON file by default. You can specify the --plan flag to generate separate JSON files for each object and a plan definition file that aggregates them. You then specify just this plan definition file when you import the data into an org.\n\nThe SOQL query can return a maximum of 2,000 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm).",
       "examples": [
-        "Delete a record from Account with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 00180XX",
-        "Delete a record from Account whose name equals \"Acme\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name=Acme\"",
-        "Delete a record from Account identified with two field values, one that contains a space; the command uses the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Universal Containers' Phone='(123) 456-7890'\" --target-org myscratch",
-        "Delete a record from the Tooling API object TraceFlag with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --use-tooling-api --sobject TraceFlag --record-id 7tf8c"
+        "Export records retrieved with the specified SOQL query into a single JSON file in the current directory; the command uses your default org:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, (SELECT Name, Address__c FROM Properties__r) FROM Broker__c\"",
+        "Export data using a SOQL query in the \"query.txt\" file and generate JSON files for each object and a plan that aggregates them:\n<%= config.bin %> <%= command.id %> --query query.txt --plan",
+        "Prepend \"export-demo\" before each generated file and generate the files in the \"export-out\" directory; run the command on the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query query.txt --plan --prefix export-demo --output-dir export-out --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -944,122 +1045,102 @@
           "multiple": false,
           "type": "option"
         },
-        "sobject": {
-          "aliases": [
-            "sobjecttype"
-          ],
-          "char": "s",
-          "deprecateAliases": true,
-          "name": "sobject",
+        "query": {
+          "char": "q",
+          "name": "query",
           "required": true,
-          "summary": "API name of the Salesforce or Tooling API object that you're deleting a record from.",
+          "summary": "SOQL query, or filepath of a file that contains the query, to retrieve records.",
           "hasDynamicHelp": false,
-          "multiple": false,
+          "multiple": true,
           "type": "option"
         },
-        "record-id": {
-          "aliases": [
-            "sobjectid"
-          ],
-          "char": "i",
-          "deprecateAliases": true,
-          "name": "record-id",
-          "summary": "ID of the record you’re deleting.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "plan": {
+          "char": "p",
+          "name": "plan",
+          "summary": "Generate multiple sObject tree files and a plan definition file for aggregated import.",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "where": {
-          "char": "w",
-          "name": "where",
-          "summary": "List of <fieldName>=<value> pairs that identify the record you want to delete.",
+        "prefix": {
+          "char": "x",
+          "name": "prefix",
+          "summary": "Prefix of generated files.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "use-tooling-api": {
+        "output-dir": {
           "aliases": [
-            "usetoolingapi"
+            "outputdir"
           ],
-          "char": "t",
+          "char": "d",
           "deprecateAliases": true,
-          "name": "use-tooling-api",
-          "summary": "Use Tooling API so you can delete a record from a Tooling API object.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "perflog": {
-          "deprecated": {
-            "version": "57"
-          },
-          "description": "Gets data on API performance metrics from the server. The data is stored in $HOME/.sfdx/apiPerformanceLog.json.",
-          "hidden": true,
-          "name": "perflog",
-          "summary": "Get API performance data.",
-          "allowNo": false,
-          "type": "boolean"
+          "name": "output-dir",
+          "summary": "Directory in which to generate the JSON files; default is current directory.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:delete:record",
+      "id": "data:export:tree",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Deletes a single record from a Salesforce or Tooling API object.",
+      "summary": "Export data from an org into one or more JSON files.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "delete",
-        "record.js"
+        "export",
+        "tree.js"
       ],
       "aliasPermutations": [
-        "force:data:record:delete",
-        "data:force:record:delete",
-        "data:record:force:delete",
-        "data:record:delete:force",
-        "force:record:data:delete",
-        "record:force:data:delete",
-        "record:data:force:delete",
-        "record:data:delete:force",
-        "force:record:delete:data",
-        "record:force:delete:data",
-        "record:delete:force:data",
-        "record:delete:data:force",
-        "force:data:delete:record",
-        "data:force:delete:record",
-        "data:delete:force:record",
-        "data:delete:record:force",
-        "force:delete:data:record",
-        "delete:force:data:record",
-        "delete:data:force:record",
-        "delete:data:record:force",
-        "force:delete:record:data",
-        "delete:force:record:data",
-        "delete:record:force:data",
-        "delete:record:data:force"
+        "force:data:tree:export",
+        "data:force:tree:export",
+        "data:tree:force:export",
+        "data:tree:export:force",
+        "force:tree:data:export",
+        "tree:force:data:export",
+        "tree:data:force:export",
+        "tree:data:export:force",
+        "force:tree:export:data",
+        "tree:force:export:data",
+        "tree:export:force:data",
+        "tree:export:data:force",
+        "force:data:export:tree",
+        "data:force:export:tree",
+        "data:export:force:tree",
+        "data:export:tree:force",
+        "force:export:data:tree",
+        "export:force:data:tree",
+        "export:data:force:tree",
+        "export:data:tree:force",
+        "force:export:tree:data",
+        "export:force:tree:data",
+        "export:tree:force:data",
+        "export:tree:data:force"
       ],
       "permutations": [
-        "data:delete:record",
-        "delete:data:record",
-        "delete:record:data",
-        "data:record:delete",
-        "record:data:delete",
-        "record:delete:data"
+        "data:export:tree",
+        "export:data:tree",
+        "export:tree:data",
+        "data:tree:export",
+        "tree:data:export",
+        "tree:export:data"
       ]
     },
-    "data:delete:resume": {
+    "data:delete:bulk": {
       "aliases": [],
       "args": {},
-      "deprecateAliases": true,
-      "description": "The command uses the job ID returned by the \"<%= config.bin %> data delete bulk\" command or the most recently-run bulk delete job.",
+      "description": "The CSV file must have only one column (\"Id\") and then the list of record IDs you want to delete, one ID per line.\n\nWhen you execute this command, it starts a job, displays the ID, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job ID to check the status of the job with the \"<%= config.bin %> data delete resume\" command.",
       "examples": [
-        "Resume a bulk delete job from your default org using an ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
-        "Resume the most recently run bulk delete job for an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --use-most-recent --target-org my-scratch"
+        "Bulk delete Account records from your default org using the list of IDs in the \"files/delete.csv\" file:\n<%= config.bin %> <%= command.id %> --sobject Account --file files/delete.csv",
+        "Bulk delete records from a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/delete.csv --wait 5 --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -1086,66 +1167,98 @@
           "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
-          "summary": "Username or alias of the target org. Not required if the \"target-org\" configuration variable is already set.",
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
         },
-        "job-id": {
+        "api-version": {
           "aliases": [
-            "jobid"
+            "apiversion"
           ],
-          "char": "i",
           "deprecateAliases": true,
-          "name": "job-id",
-          "summary": "ID of the job you want to resume.",
+          "description": "Override the api version used for api requests made by this command",
+          "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "use-most-recent": {
-          "exclusive": [
-            "job-id"
+        "loglevel": {
+          "deprecated": {
+            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
+          },
+          "hidden": true,
+          "name": "loglevel",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "file": {
+          "aliases": [
+            "csvfile"
           ],
-          "name": "use-most-recent",
-          "summary": "Use the ID of the most recently-run bulk job.",
-          "allowNo": false,
-          "type": "boolean"
+          "char": "f",
+          "deprecateAliases": true,
+          "name": "file",
+          "required": true,
+          "summary": "CSV file that contains the IDs of the records to update or delete.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "sobject": {
+          "aliases": [
+            "sobjecttype"
+          ],
+          "char": "s",
+          "deprecateAliases": true,
+          "name": "sobject",
+          "required": true,
+          "summary": "API name of the Salesforce object, either standard or custom, that you want to update or delete records from.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
         "wait": {
+          "char": "w",
           "name": "wait",
           "summary": "Number of minutes to wait for the command to complete before displaying the results.",
-          "default": "5 minutes",
+          "default": "0 minutes",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
         },
-        "api-version": {
-          "description": "Override the api version used for api requests made by this command",
-          "name": "api-version",
+        "line-ending": {
+          "dependsOn": [
+            "file"
+          ],
+          "name": "line-ending",
+          "summary": "Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and Linux it's `LF`.",
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "CRLF",
+            "LF"
+          ],
           "type": "option"
         },
-        "loglevel": {
-          "deprecated": {
-            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
-          },
-          "hidden": true,
-          "name": "loglevel",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+        "hard-delete": {
+          "description": "You must have the \"Bulk API Hard Delete\" system permission to use this flag. The permission is disabled by default and can be enabled only by a system administrator.",
+          "name": "hard-delete",
+          "summary": "Mark the records as immediately eligible for deletion by your org. If you don't specify this flag, the deleted records go into the Recycle Bin.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:delete:resume",
+      "id": "data:delete:bulk",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Resume a bulk delete job that you previously started. Uses Bulk API 2.0.",
+      "summary": "Bulk delete records from an org using a CSV file. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -1153,25 +1266,30 @@
         "commands",
         "data",
         "delete",
-        "resume.js"
+        "bulk.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:delete:resume",
-        "delete:data:resume",
-        "delete:resume:data",
-        "data:resume:delete",
-        "resume:data:delete",
-        "resume:delete:data"
+        "data:delete:bulk",
+        "delete:data:bulk",
+        "delete:bulk:data",
+        "data:bulk:delete",
+        "bulk:data:delete",
+        "bulk:delete:data"
       ]
     },
-    "data:export:bulk": {
-      "aliases": [],
+    "data:delete:record": {
+      "aliases": [
+        "force:data:record:delete"
+      ],
       "args": {},
-      "description": "You can use this command to export millions of records from an org, either to migrate data or to back it up.\n\nUse a SOQL query to specify the fields of a standard or custom object that you want to export. Specify the SOQL query either at the command line with the --query flag or read it from a file with the --query-file flag; you can't specify both flags. The --output-file flag is required, which means you can only write the records to a file, in either CSV or JSON format.\n\nBulk exports can take a while, depending on how many records are returned by the SOQL query. If the command times out, the command displays the job ID. To see the status and get the results of the job, run \"sf data export resume\" and pass the job ID to the --job-id flag.\n\nIMPORTANT: This command uses Bulk API 2.0, which limits the type of SOQL queries you can run. For example, you can't use aggregate functions such as count(). For the complete list of limitations, see the \"SOQL Considerations\" section in the \"Bulk API 2.0 and Bulk API Developer Guide\" (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/queries.htm).",
+      "deprecateAliases": true,
+      "description": "Specify the record you want to delete with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the delete fails; the error displays how many records were found.\n\nWhen specifying field-value pairs, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThis command deletes a record from Salesforce objects by default. Use the --use-tooling-api flag to delete from a Tooling API object.",
       "examples": [
-        "Export the Id, Name, and Account.Name fields of the Contact object into a CSV-formatted file; if the export doesn't complete in 10 minutes, the command ends and displays a job ID. Use the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.csv --wait 10 --target-org my-scratch",
-        "Similar to previous example, but use the default org, export the records into a JSON-formatted file, and include records that have been soft deleted:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, Account.Name FROM Contact\" --output-file export-accounts.json --result-format json --wait 10 --all-rows"
+        "Delete a record from Account with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 00180XX",
+        "Delete a record from Account whose name equals \"Acme\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name=Acme\"",
+        "Delete a record from Account identified with two field values, one that contains a space; the command uses the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Universal Containers' Phone='(123) 456-7890'\" --target-org myscratch",
+        "Delete a record from the Tooling API object TraceFlag with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --use-tooling-api --sobject TraceFlag --record-id 7tf8c"
       ],
       "flags": {
         "json": {
@@ -1190,7 +1308,12 @@
           "type": "option"
         },
         "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
           "char": "o",
+          "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
           "required": true,
@@ -1200,151 +1323,142 @@
           "type": "option"
         },
         "api-version": {
+          "aliases": [
+            "apiversion"
+          ],
+          "deprecateAliases": true,
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "wait": {
-          "char": "w",
-          "name": "wait",
-          "summary": "Time to wait for the command to finish, in minutes.",
-          "hasDynamicHelp": true,
-          "helpValue": "<minutes>",
-          "multiple": false,
-          "type": "option"
-        },
-        "query": {
-          "char": "q",
-          "exclusive": [
-            "query-file"
-          ],
-          "name": "query",
-          "summary": "SOQL query to execute.",
+        "loglevel": {
+          "deprecated": {
+            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
+          },
+          "hidden": true,
+          "name": "loglevel",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "query-file": {
-          "exclusive": [
-            "query"
+        "sobject": {
+          "aliases": [
+            "sobjecttype"
           ],
-          "name": "query-file",
-          "summary": "File that contains the SOQL query.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "all-rows": {
-          "name": "all-rows",
-          "summary": "Include records that have been soft-deleted due to a merge or delete. By default, deleted records are not returned.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "output-file": {
-          "name": "output-file",
+          "char": "s",
+          "deprecateAliases": true,
+          "name": "sobject",
           "required": true,
-          "summary": "File where records are written.",
+          "summary": "API name of the Salesforce or Tooling API object that you're deleting a record from.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "result-format": {
-          "char": "r",
-          "name": "result-format",
-          "required": true,
-          "summary": "Format to write the results.",
-          "default": "csv",
+        "record-id": {
+          "aliases": [
+            "sobjectid"
+          ],
+          "char": "i",
+          "deprecateAliases": true,
+          "name": "record-id",
+          "summary": "ID of the record you’re deleting.",
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "csv",
-            "json"
-          ],
           "type": "option"
         },
-        "column-delimiter": {
-          "name": "column-delimiter",
-          "relationships": [
-            {
-              "type": "some",
-              "flags": [
-                {
-                  "name": "result-format"
-                }
-              ]
-            }
-          ],
-          "summary": "Column delimiter to be used when writing CSV output. Default is COMMA.",
+        "where": {
+          "char": "w",
+          "name": "where",
+          "summary": "List of <fieldName>=<value> pairs that identify the record you want to delete.",
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "BACKQUOTE",
-            "CARET",
-            "COMMA",
-            "PIPE",
-            "SEMICOLON",
-            "TAB"
-          ],
           "type": "option"
         },
-        "line-ending": {
-          "name": "line-ending",
-          "relationships": [
-            {
-              "type": "some",
-              "flags": [
-                {
-                  "name": "result-format"
-                }
-              ]
-            }
-          ],
-          "summary": "Line ending to be used when writing CSV output. Default value on Windows is is `CRLF`; on macOS and Linux it's `LR`.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "LF",
-            "CRLF"
+        "use-tooling-api": {
+          "aliases": [
+            "usetoolingapi"
           ],
-          "type": "option"
+          "char": "t",
+          "deprecateAliases": true,
+          "name": "use-tooling-api",
+          "summary": "Use Tooling API so you can delete a record from a Tooling API object.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "perflog": {
+          "deprecated": {
+            "version": "57"
+          },
+          "description": "Gets data on API performance metrics from the server. The data is stored in $HOME/.sfdx/apiPerformanceLog.json.",
+          "hidden": true,
+          "name": "perflog",
+          "summary": "Get API performance data.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:export:bulk",
+      "id": "data:delete:record",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Bulk export records from an org into a file using a SOQL query. Uses Bulk API 2.0.",
+      "summary": "Deletes a single record from a Salesforce or Tooling API object.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "export",
-        "bulk.js"
+        "delete",
+        "record.js"
+      ],
+      "aliasPermutations": [
+        "force:data:record:delete",
+        "data:force:record:delete",
+        "data:record:force:delete",
+        "data:record:delete:force",
+        "force:record:data:delete",
+        "record:force:data:delete",
+        "record:data:force:delete",
+        "record:data:delete:force",
+        "force:record:delete:data",
+        "record:force:delete:data",
+        "record:delete:force:data",
+        "record:delete:data:force",
+        "force:data:delete:record",
+        "data:force:delete:record",
+        "data:delete:force:record",
+        "data:delete:record:force",
+        "force:delete:data:record",
+        "delete:force:data:record",
+        "delete:data:force:record",
+        "delete:data:record:force",
+        "force:delete:record:data",
+        "delete:force:record:data",
+        "delete:record:force:data",
+        "delete:record:data:force"
       ],
-      "aliasPermutations": [],
       "permutations": [
-        "data:export:bulk",
-        "export:data:bulk",
-        "export:bulk:data",
-        "data:bulk:export",
-        "bulk:data:export",
-        "bulk:export:data"
+        "data:delete:record",
+        "delete:data:record",
+        "delete:record:data",
+        "data:record:delete",
+        "record:data:delete",
+        "record:delete:data"
       ]
     },
-    "data:export:resume": {
+    "data:delete:resume": {
       "aliases": [],
       "args": {},
-      "description": "When the original \"data export bulk\" command times out, it displays a job ID. To see the status and get the results of the bulk export, run this command by either passing it the job ID or using the --use-most-recent flag to specify the most recent bulk export job.\n\nUsing either `--job-id` or `--use-most-recent` will properly resolve to the correct org where the bulk job was started based on the cached data by \"data export bulk\".",
+      "deprecateAliases": true,
+      "description": "The command uses the job ID returned by the \"<%= config.bin %> data delete bulk\" command or the most recently-run bulk delete job.",
       "examples": [
-        "Resume a bulk export job run by specifying a job ID:\nsf <%= command.id %> --job-id 750xx000000005sAAA",
-        "Resume the most recently-run bulk export job:\nsf data export resume --use-most-recent"
+        "Resume a bulk delete job from your default org using an ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
+        "Resume the most recently run bulk delete job for an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --use-most-recent --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -1362,220 +1476,106 @@
           "multiple": false,
           "type": "option"
         },
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
+          "char": "o",
+          "deprecateAliases": true,
+          "name": "target-org",
+          "noCacheDefault": true,
+          "summary": "Username or alias of the target org. Not required if the \"target-org\" configuration variable is already set.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        },
         "job-id": {
+          "aliases": [
+            "jobid"
+          ],
           "char": "i",
+          "deprecateAliases": true,
           "name": "job-id",
-          "summary": "Job ID of the bulk export.",
+          "summary": "ID of the job you want to resume.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "use-most-recent": {
+          "exclusive": [
+            "job-id"
+          ],
           "name": "use-most-recent",
-          "summary": "Use the job ID of the bulk export job that was most recently run.",
+          "summary": "Use the ID of the most recently-run bulk job.",
           "allowNo": false,
           "type": "boolean"
         },
+        "wait": {
+          "name": "wait",
+          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
+          "default": "5 minutes",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        },
         "api-version": {
           "description": "Override the api version used for api requests made by this command",
           "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "loglevel": {
+          "deprecated": {
+            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
+          },
+          "hidden": true,
+          "name": "loglevel",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
-      "hasDynamicHelp": false,
+      "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:export:resume",
+      "id": "data:delete:resume",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Resume a bulk export job that you previously started. Uses Bulk API 2.0.",
+      "summary": "Resume a bulk delete job that you previously started. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "export",
+        "delete",
         "resume.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:export:resume",
-        "export:data:resume",
-        "export:resume:data",
-        "data:resume:export",
-        "resume:data:export",
-        "resume:export:data"
+        "data:delete:resume",
+        "delete:data:resume",
+        "delete:resume:data",
+        "data:resume:delete",
+        "resume:data:delete",
+        "resume:delete:data"
       ]
     },
-    "data:export:tree": {
+    "data:get:record": {
       "aliases": [
-        "force:data:tree:export"
+        "force:data:record:get"
       ],
       "args": {},
       "deprecateAliases": true,
-      "description": "Specify a SOQL query, either directly at the command line or read from a file, to retrieve the data you want to export. The exported data is written to JSON files in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use these JSON files to import data into an org with the \"<%= config.bin %> data import tree\" command.\n\nIf your SOQL query references multiple objects, the command generates a single JSON file by default. You can specify the --plan flag to generate separate JSON files for each object and a plan definition file that aggregates them. You then specify just this plan definition file when you import the data into an org.\n\nThe SOQL query can return a maximum of 2,000 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm).",
+      "description": "Specify the record you want to retrieve with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the command fails; the error displays how many records were found.\n\nWhen specifying field-value pairs, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThe command displays all the record's fields and their values, one field per terminal line. Fields with no values are displayed as \"null\".\n\nThis command retrieves a record from Salesforce objects by default. Use the --use-tooling-api flag to retrieve from a Tooling API object.",
       "examples": [
-        "Export records retrieved with the specified SOQL query into a single JSON file in the current directory; the command uses your default org:\n<%= config.bin %> <%= command.id %> --query \"SELECT Id, Name, (SELECT Name, Address__c FROM Properties__r) FROM Broker__c\"",
-        "Export data using a SOQL query in the \"query.txt\" file and generate JSON files for each object and a plan that aggregates them:\n<%= config.bin %> <%= command.id %> --query query.txt --plan",
-        "Prepend \"export-demo\" before each generated file and generate the files in the \"export-out\" directory; run the command on the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --query query.txt --plan --prefix export-demo --output-dir export-out --target-org my-scratch"
-      ],
-      "flags": {
-        "json": {
-          "description": "Format output as json.",
-          "helpGroup": "GLOBAL",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "flags-dir": {
-          "helpGroup": "GLOBAL",
-          "name": "flags-dir",
-          "summary": "Import flag values from a directory.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "target-org": {
-          "aliases": [
-            "targetusername",
-            "u"
-          ],
-          "char": "o",
-          "deprecateAliases": true,
-          "name": "target-org",
-          "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        },
-        "api-version": {
-          "aliases": [
-            "apiversion"
-          ],
-          "deprecateAliases": true,
-          "description": "Override the api version used for api requests made by this command",
-          "name": "api-version",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "loglevel": {
-          "deprecated": {
-            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
-          },
-          "hidden": true,
-          "name": "loglevel",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "query": {
-          "char": "q",
-          "name": "query",
-          "required": true,
-          "summary": "SOQL query, or filepath of a file that contains the query, to retrieve records.",
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "plan": {
-          "char": "p",
-          "name": "plan",
-          "summary": "Generate multiple sObject tree files and a plan definition file for aggregated import.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "prefix": {
-          "char": "x",
-          "name": "prefix",
-          "summary": "Prefix of generated files.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "output-dir": {
-          "aliases": [
-            "outputdir"
-          ],
-          "char": "d",
-          "deprecateAliases": true,
-          "name": "output-dir",
-          "summary": "Directory in which to generate the JSON files; default is current directory.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": true,
-      "hiddenAliases": [],
-      "id": "data:export:tree",
-      "pluginAlias": "@salesforce/plugin-data",
-      "pluginName": "@salesforce/plugin-data",
-      "pluginType": "core",
-      "strict": true,
-      "summary": "Export data from an org into one or more JSON files.",
-      "enableJsonFlag": true,
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "data",
-        "export",
-        "tree.js"
-      ],
-      "aliasPermutations": [
-        "force:data:tree:export",
-        "data:force:tree:export",
-        "data:tree:force:export",
-        "data:tree:export:force",
-        "force:tree:data:export",
-        "tree:force:data:export",
-        "tree:data:force:export",
-        "tree:data:export:force",
-        "force:tree:export:data",
-        "tree:force:export:data",
-        "tree:export:force:data",
-        "tree:export:data:force",
-        "force:data:export:tree",
-        "data:force:export:tree",
-        "data:export:force:tree",
-        "data:export:tree:force",
-        "force:export:data:tree",
-        "export:force:data:tree",
-        "export:data:force:tree",
-        "export:data:tree:force",
-        "force:export:tree:data",
-        "export:force:tree:data",
-        "export:tree:force:data",
-        "export:tree:data:force"
-      ],
-      "permutations": [
-        "data:export:tree",
-        "export:data:tree",
-        "export:tree:data",
-        "data:tree:export",
-        "tree:data:export",
-        "tree:export:data"
-      ]
-    },
-    "data:get:record": {
-      "aliases": [
-        "force:data:record:get"
-      ],
-      "args": {},
-      "deprecateAliases": true,
-      "description": "Specify the record you want to retrieve with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the command fails; the error displays how many records were found.\n\nWhen specifying field-value pairs, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThe command displays all the record's fields and their values, one field per terminal line. Fields with no values are displayed as \"null\".\n\nThis command retrieves a record from Salesforce objects by default. Use the --use-tooling-api flag to retrieve from a Tooling API object.",
-      "examples": [
-        "Retrieve and display a record from Account with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 00180XX",
-        "Retrieve a record from Account whose name equals \"Acme\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name=Acme\"",
-        "Retrieve a record from Account identified with two field values, one that contains a space; the command uses the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Universal Containers' Phone='(123) 456-7890'\" --target-org myscratch",
-        "Retrieve a record from the Tooling API object TraceFlag with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --use-tooling-api --sobject TraceFlag --record-id 7tf8c"
+        "Retrieve and display a record from Account with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 00180XX",
+        "Retrieve a record from Account whose name equals \"Acme\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name=Acme\"",
+        "Retrieve a record from Account identified with two field values, one that contains a space; the command uses the org with alias \"my-scratch\":\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Universal Containers' Phone='(123) 456-7890'\" --target-org myscratch",
+        "Retrieve a record from the Tooling API object TraceFlag with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --use-tooling-api --sobject TraceFlag --record-id 7tf8c"
       ],
       "flags": {
         "json": {
@@ -2073,13 +2073,12 @@
         "tree:import:data"
       ]
     },
-    "data:upsert:bulk": {
+    "data:update:bulk": {
       "aliases": [],
       "args": {},
-      "description": "An upsert refers to inserting a record into a Salesforce object if the record doesn't already exist, or updating it if it does exist.\n\nWhen you execute this command, it starts a job, displays the ID, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job and batch IDs to check the status of the job with the \"<%= config.bin %> data upsert resume\" command.\n\nSee \"Prepare CSV Files\" in the Bulk API Developer Guide for details on formatting your CSV file. (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/datafiles_prepare_csv.htm)",
+      "description": "You can use this command to update millions of Salesforce object records based on a file in comma-separated values (CSV) format.\n\nAll the records in the CSV file must be for the same Salesforce object. Specify the object with the `--sobject` flag. The first column of every line in the CSV file must be an ID of the record you want to update. The CSV file can contain only existing records; if a record in the file doesn't currently exist in the Salesforce object, the command fails. Consider using \"sf data upsert bulk\" if you also want to insert new records.\n\nBulk updates can take a while, depending on how many records are in the CSV file. If the command times out, the command displays the job ID. To see the status and get the results of the job, run \"sf data update resume\" and pass the job ID to the --job-id flag.\n\nFor information and examples about how to prepare your CSV files, see \"Prepare Data to Ingest\" in the \"Bulk API 2.0 and Bulk API Developer Guide\" (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/datafiles_prepare_data.htm).",
       "examples": [
-        "Bulk upsert records to the Contact object in your default org:\n<%= config.bin %> <%= command.id %> --sobject Contact --file files/contacts.csv --external-id Id",
-        "Bulk upsert records to a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/file.csv --external-id MyField__c --wait 5 --target-org my-scratch"
+        "Update Account records from a CSV-formatted file into an org with alias \"my-scratch\"; if the update doesn't complete in 10 minutes, the command ends and displays a job ID:\n<%= config.bin %> <%= command.id %> --file accounts.csv --sobject Account --wait 10 --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -2097,73 +2096,45 @@
           "multiple": false,
           "type": "option"
         },
-        "target-org": {
-          "aliases": [
-            "targetusername",
-            "u"
-          ],
-          "char": "o",
-          "deprecateAliases": true,
-          "name": "target-org",
-          "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
+        "wait": {
+          "char": "w",
+          "name": "wait",
+          "summary": "Time to wait for the command to finish, in minutes.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
         },
-        "api-version": {
-          "aliases": [
-            "apiversion"
-          ],
-          "deprecateAliases": true,
-          "description": "Override the api version used for api requests made by this command",
-          "name": "api-version",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "loglevel": {
-          "deprecated": {
-            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
-          },
-          "hidden": true,
-          "name": "loglevel",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "file": {
-          "aliases": [
-            "csvfile"
-          ],
           "char": "f",
-          "deprecateAliases": true,
           "name": "file",
           "required": true,
-          "summary": "CSV file that contains the IDs of the records to update or delete.",
+          "summary": "CSV file that contains the Salesforce object records you want to update.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "sobject": {
-          "aliases": [
-            "sobjecttype"
-          ],
           "char": "s",
-          "deprecateAliases": true,
           "name": "sobject",
           "required": true,
-          "summary": "API name of the Salesforce object, either standard or custom, that you want to update or delete records from.",
+          "summary": "API name of the Salesforce object, either standard or custom, which you are updating.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "wait": {
-          "char": "w",
-          "name": "wait",
-          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
-          "default": "0 minutes",
+        "api-version": {
+          "description": "Override the api version used for api requests made by this command",
+          "name": "api-version",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "target-org": {
+          "char": "o",
+          "name": "target-org",
+          "noCacheDefault": true,
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
@@ -2196,55 +2167,47 @@
             "TAB"
           ],
           "type": "option"
-        },
-        "external-id": {
-          "aliases": [
-            "externalid"
-          ],
-          "char": "i",
-          "deprecateAliases": true,
-          "name": "external-id",
-          "required": true,
-          "summary": "Name of the external ID field, or the Id field.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:upsert:bulk",
+      "id": "data:update:bulk",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Bulk upsert records to an org from a CSV file. Uses Bulk API 2.0.",
+      "summary": "Bulk update records to an org from a CSV file. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "upsert",
+        "update",
         "bulk.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:upsert:bulk",
-        "upsert:data:bulk",
-        "upsert:bulk:data",
-        "data:bulk:upsert",
-        "bulk:data:upsert",
-        "bulk:upsert:data"
+        "data:update:bulk",
+        "update:data:bulk",
+        "update:bulk:data",
+        "data:bulk:update",
+        "bulk:data:update",
+        "bulk:update:data"
       ]
     },
-    "data:upsert:resume": {
-      "aliases": [],
+    "data:update:record": {
+      "aliases": [
+        "force:data:record:update"
+      ],
       "args": {},
-      "description": "The command uses the job ID returned from the \"<%= config.bin %> data upsert bulk\" command or the most recently-run bulk upsert job.",
+      "deprecateAliases": true,
+      "description": "Specify the record you want to update with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the update fails; the error displays how many records were found.\n\nWhen using field-value pairs for both identifying the record and specifiyng the new field values, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThis command updates a record in Salesforce objects by default. Use the --use-tooling-api flag to update a Tooling API object.",
       "examples": [
-        "Resume a bulk upsert job from your default org using an ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
-        "Resume the most recently run bulk upsert job for an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --use-most-recent --target-org my-scratch"
+        "Update the Name field of an Account record with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 001D0 --values \"Name=NewAcme\"",
+        "Update the Name field of an Account record whose current name is 'Old Acme':\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Old Acme'\" --values \"Name='New Acme'\"",
+        "Update the Name and Website fields of an Account record with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 001D0 --values \"Name='Acme III' Website=www.example.com\"",
+        "Update the ExpirationDate field of a record of the Tooling API object TraceFlag using the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> -t --sobject TraceFlag --record-id 7tf170000009cUBAAY --values \"ExpirationDate=2017-12-01T00:58:04.000+0000\""
       ],
       "flags": {
         "json": {
@@ -2271,91 +2234,156 @@
           "deprecateAliases": true,
           "name": "target-org",
           "noCacheDefault": true,
-          "summary": "Username or alias of the target org. Not required if the \"target-org\" configuration variable is already set.",
+          "required": true,
+          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
         },
-        "job-id": {
+        "api-version": {
           "aliases": [
-            "jobid"
+            "apiversion"
           ],
-          "char": "i",
           "deprecateAliases": true,
-          "name": "job-id",
-          "summary": "ID of the job you want to resume.",
+          "description": "Override the api version used for api requests made by this command",
+          "name": "api-version",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "use-most-recent": {
-          "exclusive": [
-            "job-id"
+        "loglevel": {
+          "deprecated": {
+            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
+          },
+          "hidden": true,
+          "name": "loglevel",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "sobject": {
+          "aliases": [
+            "sobjecttype"
           ],
-          "name": "use-most-recent",
-          "summary": "Use the ID of the most recently-run bulk job.",
-          "allowNo": false,
-          "type": "boolean"
+          "char": "s",
+          "deprecateAliases": true,
+          "name": "sobject",
+          "required": true,
+          "summary": "API name of the Salesforce or Tooling API object that contains the record you're updating.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         },
-        "wait": {
-          "name": "wait",
-          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
-          "default": "5 minutes",
-          "hasDynamicHelp": true,
+        "record-id": {
+          "aliases": [
+            "sobjectid"
+          ],
+          "char": "i",
+          "deprecateAliases": true,
+          "name": "record-id",
+          "summary": "ID of the record you’re updating.",
+          "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "api-version": {
-          "description": "Override the api version used for api requests made by this command",
-          "name": "api-version",
+        "where": {
+          "char": "w",
+          "name": "where",
+          "summary": "List of <fieldName>=<value> pairs that identify the record you want to update.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "loglevel": {
-          "deprecated": {
-            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
-          },
-          "hidden": true,
-          "name": "loglevel",
+        "values": {
+          "char": "v",
+          "name": "values",
+          "required": true,
+          "summary": "Fields that you're updating, in the format of <fieldName>=<value> pairs.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "use-tooling-api": {
+          "aliases": [
+            "usetoolingapi"
+          ],
+          "char": "t",
+          "deprecateAliases": true,
+          "name": "use-tooling-api",
+          "summary": "Use Tooling API so you can update a record in a Tooling API object.",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "perflog": {
+          "deprecated": {
+            "version": "57"
+          },
+          "hidden": true,
+          "name": "perflog",
+          "summary": "Get API performance data.",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:upsert:resume",
+      "id": "data:update:record",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Resume a bulk upsert job that you previously started. Uses Bulk API 2.0.",
+      "summary": "Updates a single record of a Salesforce or Tooling API object.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "upsert",
-        "resume.js"
+        "update",
+        "record.js"
+      ],
+      "aliasPermutations": [
+        "force:data:record:update",
+        "data:force:record:update",
+        "data:record:force:update",
+        "data:record:update:force",
+        "force:record:data:update",
+        "record:force:data:update",
+        "record:data:force:update",
+        "record:data:update:force",
+        "force:record:update:data",
+        "record:force:update:data",
+        "record:update:force:data",
+        "record:update:data:force",
+        "force:data:update:record",
+        "data:force:update:record",
+        "data:update:force:record",
+        "data:update:record:force",
+        "force:update:data:record",
+        "update:force:data:record",
+        "update:data:force:record",
+        "update:data:record:force",
+        "force:update:record:data",
+        "update:force:record:data",
+        "update:record:force:data",
+        "update:record:data:force"
       ],
-      "aliasPermutations": [],
       "permutations": [
-        "data:upsert:resume",
-        "upsert:data:resume",
-        "upsert:resume:data",
-        "data:resume:upsert",
-        "resume:data:upsert",
-        "resume:upsert:data"
+        "data:update:record",
+        "update:data:record",
+        "update:record:data",
+        "data:record:update",
+        "record:data:update",
+        "record:update:data"
       ]
     },
-    "data:update:bulk": {
+    "data:update:resume": {
       "aliases": [],
       "args": {},
-      "description": "You can use this command to update millions of Salesforce object records based on a file in comma-separated values (CSV) format.\n\nAll the records in the CSV file must be for the same Salesforce object. Specify the object with the `--sobject` flag. The first column of every line in the CSV file must be an ID of the record you want to update. The CSV file can contain only existing records; if a record in the file doesn't currently exist in the Salesforce object, the command fails. Consider using \"sf data upsert bulk\" if you also want to insert new records.\n\nBulk updates can take a while, depending on how many records are in the CSV file. If the command times out, the command displays the job ID. To see the status and get the results of the job, run \"sf data update resume\" and pass the job ID to the --job-id flag.\n\nFor information and examples about how to prepare your CSV files, see \"Prepare Data to Ingest\" in the \"Bulk API 2.0 and Bulk API Developer Guide\" (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/datafiles_prepare_data.htm).",
+      "description": "When the original \"sf data update bulk\" command times out, it displays a job ID. To see the status and get the results of the bulk update, run this command by either passing it the job ID or using the --use-most-recent flag to specify the most recent bulk update job.\n\nUsing either `--job-id` or `--use-most-recent` will properly resolve to the correct org where the bulk job was started based on the cached data by \"data update bulk\".",
       "examples": [
-        "Update Account records from a CSV-formatted file into an org with alias \"my-scratch\"; if the update doesn't complete in 10 minutes, the command ends and displays a job ID:\n<%= config.bin %> <%= command.id %> --file accounts.csv --sobject Account --wait 10 --target-org my-scratch"
+        "Resume a bulk update job using a job ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
+        "Resume the most recently run bulk update job:\n<%= config.bin %> <%= command.id %> --use-most-recent"
       ],
       "flags": {
         "json": {
@@ -2373,87 +2401,38 @@
           "multiple": false,
           "type": "option"
         },
-        "wait": {
-          "char": "w",
-          "name": "wait",
-          "summary": "Time to wait for the command to finish, in minutes.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
-        },
-        "file": {
-          "char": "f",
-          "name": "file",
-          "required": true,
-          "summary": "CSV file that contains the Salesforce object records you want to update.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "sobject": {
-          "char": "s",
-          "name": "sobject",
-          "required": true,
-          "summary": "API name of the Salesforce object, either standard or custom, which you are updating.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "api-version": {
-          "description": "Override the api version used for api requests made by this command",
-          "name": "api-version",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "target-org": {
-          "char": "o",
-          "name": "target-org",
-          "noCacheDefault": true,
-          "required": true,
-          "summary": "Username or alias of the target org. Not required if the `target-org` configuration variable is already set.",
-          "hasDynamicHelp": true,
-          "multiple": false,
-          "type": "option"
+        "use-most-recent": {
+          "name": "use-most-recent",
+          "summary": "Use the job ID of the bulk update job that was most recently run.",
+          "allowNo": false,
+          "type": "boolean"
         },
-        "line-ending": {
-          "dependsOn": [
-            "file"
-          ],
-          "name": "line-ending",
-          "summary": "Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and Linux it's `LF`.",
+        "job-id": {
+          "char": "i",
+          "name": "job-id",
+          "summary": "Job ID of the bulk update.",
           "hasDynamicHelp": false,
           "multiple": false,
-          "options": [
-            "CRLF",
-            "LF"
-          ],
           "type": "option"
         },
-        "column-delimiter": {
-          "name": "column-delimiter",
-          "summary": "Column delimiter used in the CSV file.",
-          "hasDynamicHelp": false,
+        "wait": {
+          "char": "w",
+          "name": "wait",
+          "summary": "Time to wait for the command to finish, in minutes.",
+          "default": "5 minutes",
+          "hasDynamicHelp": true,
           "multiple": false,
-          "options": [
-            "BACKQUOTE",
-            "CARET",
-            "COMMA",
-            "PIPE",
-            "SEMICOLON",
-            "TAB"
-          ],
           "type": "option"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:update:bulk",
+      "id": "data:update:resume",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Bulk update records to an org from a CSV file. Uses Bulk API 2.0.",
+      "summary": "Resume a bulk update job that you previously started. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -2461,30 +2440,25 @@
         "commands",
         "data",
         "update",
-        "bulk.js"
+        "resume.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:update:bulk",
-        "update:data:bulk",
-        "update:bulk:data",
-        "data:bulk:update",
-        "bulk:data:update",
-        "bulk:update:data"
+        "data:update:resume",
+        "update:data:resume",
+        "update:resume:data",
+        "data:resume:update",
+        "resume:data:update",
+        "resume:update:data"
       ]
     },
-    "data:update:record": {
-      "aliases": [
-        "force:data:record:update"
-      ],
+    "data:upsert:bulk": {
+      "aliases": [],
       "args": {},
-      "deprecateAliases": true,
-      "description": "Specify the record you want to update with either its ID or with a list of field-value pairs that identify the record. If your list of fields identifies more than one record, the update fails; the error displays how many records were found.\n\nWhen using field-value pairs for both identifying the record and specifiyng the new field values, use the format <fieldName>=<value>. Enclose all field-value pairs in one set of double quotation marks, delimited by spaces. Enclose values that contain spaces in single quotes.\n\nThis command updates a record in Salesforce objects by default. Use the --use-tooling-api flag to update a Tooling API object.",
+      "description": "An upsert refers to inserting a record into a Salesforce object if the record doesn't already exist, or updating it if it does exist.\n\nWhen you execute this command, it starts a job, displays the ID, and then immediately returns control of the terminal to you by default. If you prefer to wait, set the --wait flag to the number of minutes; if it times out, the command outputs the IDs. Use the job and batch IDs to check the status of the job with the \"<%= config.bin %> data upsert resume\" command.\n\nSee \"Prepare CSV Files\" in the Bulk API Developer Guide for details on formatting your CSV file. (https://developer.salesforce.com/docs/atlas.en-us.api_asynch.meta/api_asynch/datafiles_prepare_csv.htm)",
       "examples": [
-        "Update the Name field of an Account record with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 001D0 --values \"Name=NewAcme\"",
-        "Update the Name field of an Account record whose current name is 'Old Acme':\n<%= config.bin %> <%= command.id %> --sobject Account --where \"Name='Old Acme'\" --values \"Name='New Acme'\"",
-        "Update the Name and Website fields of an Account record with the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> --sobject Account --record-id 001D0 --values \"Name='Acme III' Website=www.example.com\"",
-        "Update the ExpirationDate field of a record of the Tooling API object TraceFlag using the specified (truncated) ID:\n<%= config.bin %> <%= command.id %> -t --sobject TraceFlag --record-id 7tf170000009cUBAAY --values \"ExpirationDate=2017-12-01T00:58:04.000+0000\""
+        "Bulk upsert records to the Contact object in your default org:\n<%= config.bin %> <%= command.id %> --sobject Contact --file files/contacts.csv --external-id Id",
+        "Bulk upsert records to a custom object in an org with alias my-scratch and wait 5 minutes for the command to complete:\n<%= config.bin %> <%= command.id %> --sobject MyObject__c --file files/file.csv --external-id MyField__c --wait 5 --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -2538,129 +2512,118 @@
           "multiple": false,
           "type": "option"
         },
-        "sobject": {
+        "file": {
           "aliases": [
-            "sobjecttype"
+            "csvfile"
           ],
-          "char": "s",
+          "char": "f",
           "deprecateAliases": true,
-          "name": "sobject",
+          "name": "file",
           "required": true,
-          "summary": "API name of the Salesforce or Tooling API object that contains the record you're updating.",
+          "summary": "CSV file that contains the IDs of the records to update or delete.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "record-id": {
+        "sobject": {
           "aliases": [
-            "sobjectid"
+            "sobjecttype"
           ],
-          "char": "i",
+          "char": "s",
           "deprecateAliases": true,
-          "name": "record-id",
-          "summary": "ID of the record you’re updating.",
+          "name": "sobject",
+          "required": true,
+          "summary": "API name of the Salesforce object, either standard or custom, that you want to update or delete records from.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
-        "where": {
+        "wait": {
           "char": "w",
-          "name": "where",
-          "summary": "List of <fieldName>=<value> pairs that identify the record you want to update.",
+          "name": "wait",
+          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
+          "default": "0 minutes",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
+        },
+        "line-ending": {
+          "dependsOn": [
+            "file"
+          ],
+          "name": "line-ending",
+          "summary": "Line ending used in the CSV file. Default value on Windows is `CRLF`; on macOS and Linux it's `LF`.",
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "CRLF",
+            "LF"
+          ],
           "type": "option"
         },
-        "values": {
-          "char": "v",
-          "name": "values",
-          "required": true,
-          "summary": "Fields that you're updating, in the format of <fieldName>=<value> pairs.",
+        "column-delimiter": {
+          "name": "column-delimiter",
+          "summary": "Column delimiter used in the CSV file.",
           "hasDynamicHelp": false,
           "multiple": false,
+          "options": [
+            "BACKQUOTE",
+            "CARET",
+            "COMMA",
+            "PIPE",
+            "SEMICOLON",
+            "TAB"
+          ],
           "type": "option"
         },
-        "use-tooling-api": {
+        "external-id": {
           "aliases": [
-            "usetoolingapi"
+            "externalid"
           ],
-          "char": "t",
+          "char": "i",
           "deprecateAliases": true,
-          "name": "use-tooling-api",
-          "summary": "Use Tooling API so you can update a record in a Tooling API object.",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "perflog": {
-          "deprecated": {
-            "version": "57"
-          },
-          "hidden": true,
-          "name": "perflog",
-          "summary": "Get API performance data.",
-          "allowNo": false,
-          "type": "boolean"
+          "name": "external-id",
+          "required": true,
+          "summary": "Name of the external ID field, or the Id field.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:update:record",
+      "id": "data:upsert:bulk",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Updates a single record of a Salesforce or Tooling API object.",
+      "summary": "Bulk upsert records to an org from a CSV file. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "update",
-        "record.js"
-      ],
-      "aliasPermutations": [
-        "force:data:record:update",
-        "data:force:record:update",
-        "data:record:force:update",
-        "data:record:update:force",
-        "force:record:data:update",
-        "record:force:data:update",
-        "record:data:force:update",
-        "record:data:update:force",
-        "force:record:update:data",
-        "record:force:update:data",
-        "record:update:force:data",
-        "record:update:data:force",
-        "force:data:update:record",
-        "data:force:update:record",
-        "data:update:force:record",
-        "data:update:record:force",
-        "force:update:data:record",
-        "update:force:data:record",
-        "update:data:force:record",
-        "update:data:record:force",
-        "force:update:record:data",
-        "update:force:record:data",
-        "update:record:force:data",
-        "update:record:data:force"
+        "upsert",
+        "bulk.js"
       ],
+      "aliasPermutations": [],
       "permutations": [
-        "data:update:record",
-        "update:data:record",
-        "update:record:data",
-        "data:record:update",
-        "record:data:update",
-        "record:update:data"
+        "data:upsert:bulk",
+        "upsert:data:bulk",
+        "upsert:bulk:data",
+        "data:bulk:upsert",
+        "bulk:data:upsert",
+        "bulk:upsert:data"
       ]
     },
-    "data:update:resume": {
+    "data:upsert:resume": {
       "aliases": [],
       "args": {},
-      "description": "When the original \"sf data update bulk\" command times out, it displays a job ID. To see the status and get the results of the bulk update, run this command by either passing it the job ID or using the --use-most-recent flag to specify the most recent bulk update job.\n\nUsing either `--job-id` or `--use-most-recent` will properly resolve to the correct org where the bulk job was started based on the cached data by \"data update bulk\".",
+      "description": "The command uses the job ID returned from the \"<%= config.bin %> data upsert bulk\" command or the most recently-run bulk upsert job.",
       "examples": [
-        "Resume a bulk update job using a job ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
-        "Resume the most recently run bulk update job:\n<%= config.bin %> <%= command.id %> --use-most-recent"
+        "Resume a bulk upsert job from your default org using an ID:\n<%= config.bin %> <%= command.id %> --job-id 750xx000000005sAAA",
+        "Resume the most recently run bulk upsert job for an org with alias my-scratch:\n<%= config.bin %> <%= command.id %> --use-most-recent --target-org my-scratch"
       ],
       "flags": {
         "json": {
@@ -2678,55 +2641,92 @@
           "multiple": false,
           "type": "option"
         },
-        "use-most-recent": {
-          "name": "use-most-recent",
-          "summary": "Use the job ID of the bulk update job that was most recently run.",
-          "allowNo": false,
-          "type": "boolean"
+        "target-org": {
+          "aliases": [
+            "targetusername",
+            "u"
+          ],
+          "char": "o",
+          "deprecateAliases": true,
+          "name": "target-org",
+          "noCacheDefault": true,
+          "summary": "Username or alias of the target org. Not required if the \"target-org\" configuration variable is already set.",
+          "hasDynamicHelp": true,
+          "multiple": false,
+          "type": "option"
         },
         "job-id": {
+          "aliases": [
+            "jobid"
+          ],
           "char": "i",
+          "deprecateAliases": true,
           "name": "job-id",
-          "summary": "Job ID of the bulk update.",
+          "summary": "ID of the job you want to resume.",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "use-most-recent": {
+          "exclusive": [
+            "job-id"
+          ],
+          "name": "use-most-recent",
+          "summary": "Use the ID of the most recently-run bulk job.",
+          "allowNo": false,
+          "type": "boolean"
+        },
         "wait": {
-          "char": "w",
           "name": "wait",
-          "summary": "Time to wait for the command to finish, in minutes.",
+          "summary": "Number of minutes to wait for the command to complete before displaying the results.",
           "default": "5 minutes",
           "hasDynamicHelp": true,
           "multiple": false,
           "type": "option"
+        },
+        "api-version": {
+          "description": "Override the api version used for api requests made by this command",
+          "name": "api-version",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "loglevel": {
+          "deprecated": {
+            "message": "The loglevel flag is no longer in use on this command. You may use it without error, but it will be ignored.\nSet the log level using the `SFDX_LOG_LEVEL` environment variable."
+          },
+          "hidden": true,
+          "name": "loglevel",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": true,
       "hiddenAliases": [],
-      "id": "data:update:resume",
+      "id": "data:upsert:resume",
       "pluginAlias": "@salesforce/plugin-data",
       "pluginName": "@salesforce/plugin-data",
       "pluginType": "core",
       "strict": true,
-      "summary": "Resume a bulk update job that you previously started. Uses Bulk API 2.0.",
+      "summary": "Resume a bulk upsert job that you previously started. Uses Bulk API 2.0.",
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
         "lib",
         "commands",
         "data",
-        "update",
+        "upsert",
         "resume.js"
       ],
       "aliasPermutations": [],
       "permutations": [
-        "data:update:resume",
-        "update:data:resume",
-        "update:resume:data",
-        "data:resume:update",
-        "resume:data:update",
-        "resume:update:data"
+        "data:upsert:resume",
+        "upsert:data:resume",
+        "upsert:resume:data",
+        "data:resume:upsert",
+        "resume:data:upsert",
+        "resume:upsert:data"
       ]
     },
     "force:data:bulk:delete": {
@@ -3166,5 +3166,5 @@
       ]
     }
   },
-  "version": "4.0.86"
+  "version": "4.0.87"
 }